diff --git a/inc/tokenizer.h b/inc/tokenizer.h
index 1e8d893..306bc03 100644
--- a/inc/tokenizer.h
+++ b/inc/tokenizer.h
@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
-/*                                                        ::::::::            */
-/*   tokenizer.h                                        :+:    :+:            */
-/*                                                     +:+                    */
-/*   By: whaffman <whaffman@student.codam.nl>         +#+                     */
-/*                                                   +#+                      */
-/*   Created: 2025/02/05 12:36:00 by whaffman      #+#    #+#                 */
-/*   Updated: 2025/02/05 12:36:01 by whaffman      ########   odam.nl         */
+/*                                                        :::      ::::::::   */
+/*   tokenizer.h                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: qmennen <qmennen@student.codam.nl>         +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2025/02/05 12:36:00 by whaffman          #+#    #+#             */
+/*   Updated: 2025/02/18 17:02:17 by qmennen          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,16 +18,16 @@
  */
 t_lexer	*ft_lexer_new(const char *input);
 void	ft_lexer_free(t_lexer *lexer);
-void	ft_lexer_readchar(t_lexer *lexer);
-char	*ft_lexer_readword(t_lexer *lexer);
+void	lexer_readchar(t_lexer *lexer);
+char	*lexer_readword(t_lexer *lexer);
 t_list	*ft_parse_input(t_lexer *lexer);
 /**
  * Token
  */
 t_token	*ft_token_next(t_lexer *lexer);
-t_token	*ft_token_new(t_token_type type, char *c, int pos);
+t_token	*token_new(t_token_type type, char *c, int pos);
 void	ft_token_free(t_token *token);
 void	ft_clear_tokenlist(void *content);
-t_token	*ft_parse_token(t_lexer *lexer);
+t_token	*token_parse(t_lexer *lexer);
 
 #endif // TOKENIZER_H
diff --git a/inc/typedef.h b/inc/typedef.h
index 817f5e0..b4ab084 100644
--- a/inc/typedef.h
+++ b/inc/typedef.h
@@ -19,6 +19,8 @@ typedef enum e_token_type
 	T_PIPE,
 	T_REDIRECT_IN,
 	T_REDIRECT_OUT,
+	T_AND,
+	T_OR,
 	T_APPEND_OUT,
 	T_HEREDOC,
 	T_EOF,
diff --git a/src/lexer/lexer_read_char.c b/src/lexer/lexer_read_char.c
index 6f62b34..4b67351 100644
--- a/src/lexer/lexer_read_char.c
+++ b/src/lexer/lexer_read_char.c
@@ -1,18 +1,18 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   lexer_readchar.c                                   :+:      :+:    :+:   */
+/*   lexer_read_char.c                                  :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: qmennen <qmennen@student.codam.nl>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/05 19:04:53 by qmennen           #+#    #+#             */
-/*   Updated: 2025/02/05 19:05:06 by qmennen          ###   ########.fr       */
+/*   Updated: 2025/02/18 17:02:17 by qmennen          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 
-void	ft_lexer_readchar(t_lexer *lexer)
+void	lexer_readchar(t_lexer *lexer)
 {
 	if ((size_t)lexer->n_pos > ft_strlen(lexer->input))
 	{
diff --git a/src/lexer/lexer_read_word.c b/src/lexer/lexer_read_word.c
index 2738be8..083240a 100644
--- a/src/lexer/lexer_read_word.c
+++ b/src/lexer/lexer_read_word.c
@@ -6,7 +6,7 @@
 /*   By: qmennen <qmennen@student.codam.nl>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/05 19:03:47 by qmennen           #+#    #+#             */
-/*   Updated: 2025/02/05 19:28:17 by qmennen          ###   ########.fr       */
+/*   Updated: 2025/02/18 17:02:17 by qmennen          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,15 +21,15 @@ static char	*parse_quotes(t_lexer *lexer)
 
 	qc = lexer->current_char;
 	word = NULL;
-	ft_lexer_readchar(lexer);
+	lexer_readchar(lexer);
 	start = lexer->pos;
 	while (lexer->current_char != '\0' && lexer->current_char != qc)
-		ft_lexer_readchar(lexer);
+		lexer_readchar(lexer);
 	len = lexer->pos - start;
 	word = malloc(sizeof(char) * len + 1);
 	ft_strlcpy(word, lexer->input + start, len + 1);
 	if (lexer->current_char == qc)
-		ft_lexer_readchar(lexer);
+		lexer_readchar(lexer);
 	else
 	{
 		free(word);
@@ -38,7 +38,7 @@ static char	*parse_quotes(t_lexer *lexer)
 	return (word);
 }
 
-char	*ft_lexer_readword(t_lexer *lexer)
+char	*lexer_readword(t_lexer *lexer)
 {
 	int		start;
 	int		len;
@@ -54,7 +54,7 @@ char	*ft_lexer_readword(t_lexer *lexer)
 		&& lexer->current_char != '\0' && !ft_isspace(lexer->current_char)
 		&& lexer->current_char != '"' && lexer->current_char != '\'')
 	{
-		ft_lexer_readchar(lexer);
+		lexer_readchar(lexer);
 	}
 	len = lexer->pos - start;
 	word = malloc(sizeof(char) * len + 1);
diff --git a/src/main.c b/src/main.c
index 78a4813..eac3a5c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -38,7 +38,7 @@ int	main(int argc, char **argv, char **envp)
 		minishell->lexer = ft_lexer_new(minishell->line);
 		minishell->tokens = ft_parse_input(minishell->lexer);
 		ft_lstiter(minishell->tokens, token_print);
-		minishell->commands = parser_get_commands(minishell->tokens);
+		//minishell->commands = parser_get_commands(minishell->tokens);
 		simple_builtins(minishell);
 		free_minishell_line(minishell);
 		ft_lstclear(&minishell->commands, free_command_list);
diff --git a/src/token/token_new.c b/src/token/token_new.c
index 6529b1b..9626f44 100644
--- a/src/token/token_new.c
+++ b/src/token/token_new.c
@@ -6,13 +6,13 @@
 /*   By: qmennen <qmennen@student.codam.nl>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/05 19:10:49 by qmennen           #+#    #+#             */
-/*   Updated: 2025/02/05 19:11:32 by qmennen          ###   ########.fr       */
+/*   Updated: 2025/02/18 17:01:52 by qmennen          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 
-t_token	*ft_token_new(t_token_type type, char *c, int pos)
+t_token	*token_new(t_token_type type, char *c, int pos)
 {
 	t_token	*token;