diff --git a/include/minishell.h b/include/minishell.h
index 36e0139..c80edc6 100644
--- a/include/minishell.h
+++ b/include/minishell.h
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/26 09:38:51 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/04/30 12:39:03 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/05/02 15:31:38 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -22,5 +22,8 @@
 # include "libft.h"
 
 char	set_env(char **env, const char *name, char *content);
+char	*get_hostname(void);
+char	*get_prompt(void);
+char	*get_pwd(void);
 
 #endif
diff --git a/libft/libft.a b/libft/libft.a
new file mode 100644
index 0000000..ca79e70
Binary files /dev/null and b/libft/libft.a differ
diff --git a/libft/src/char/ft_isalnum.o b/libft/src/char/ft_isalnum.o
new file mode 100644
index 0000000..1b85bba
Binary files /dev/null and b/libft/src/char/ft_isalnum.o differ
diff --git a/libft/src/char/ft_isalpha.o b/libft/src/char/ft_isalpha.o
new file mode 100644
index 0000000..3690e19
Binary files /dev/null and b/libft/src/char/ft_isalpha.o differ
diff --git a/libft/src/char/ft_isascii.o b/libft/src/char/ft_isascii.o
new file mode 100644
index 0000000..0c87c23
Binary files /dev/null and b/libft/src/char/ft_isascii.o differ
diff --git a/libft/src/char/ft_isdigit.o b/libft/src/char/ft_isdigit.o
new file mode 100644
index 0000000..8aa6b69
Binary files /dev/null and b/libft/src/char/ft_isdigit.o differ
diff --git a/libft/src/char/ft_isprint.o b/libft/src/char/ft_isprint.o
new file mode 100644
index 0000000..e3a203c
Binary files /dev/null and b/libft/src/char/ft_isprint.o differ
diff --git a/libft/src/int/ft_abs.o b/libft/src/int/ft_abs.o
new file mode 100644
index 0000000..ab149bb
Binary files /dev/null and b/libft/src/int/ft_abs.o differ
diff --git a/libft/src/int/ft_max.o b/libft/src/int/ft_max.o
new file mode 100644
index 0000000..7f7accf
Binary files /dev/null and b/libft/src/int/ft_max.o differ
diff --git a/libft/src/int/ft_min.o b/libft/src/int/ft_min.o
new file mode 100644
index 0000000..b4a89e1
Binary files /dev/null and b/libft/src/int/ft_min.o differ
diff --git a/libft/src/io/ft_printf.o b/libft/src/io/ft_printf.o
new file mode 100644
index 0000000..3c67115
Binary files /dev/null and b/libft/src/io/ft_printf.o differ
diff --git a/libft/src/io/ft_printf_fd.o b/libft/src/io/ft_printf_fd.o
new file mode 100644
index 0000000..5e769f7
Binary files /dev/null and b/libft/src/io/ft_printf_fd.o differ
diff --git a/libft/src/io/ft_putchar_fd.o b/libft/src/io/ft_putchar_fd.o
new file mode 100644
index 0000000..9f0628e
Binary files /dev/null and b/libft/src/io/ft_putchar_fd.o differ
diff --git a/libft/src/io/ft_putendl_fd.o b/libft/src/io/ft_putendl_fd.o
new file mode 100644
index 0000000..83b7cb2
Binary files /dev/null and b/libft/src/io/ft_putendl_fd.o differ
diff --git a/libft/src/io/ft_putnbr_fd.o b/libft/src/io/ft_putnbr_fd.o
new file mode 100644
index 0000000..8d657c9
Binary files /dev/null and b/libft/src/io/ft_putnbr_fd.o differ
diff --git a/libft/src/io/ft_putstr_fd.o b/libft/src/io/ft_putstr_fd.o
new file mode 100644
index 0000000..2bb29e8
Binary files /dev/null and b/libft/src/io/ft_putstr_fd.o differ
diff --git a/libft/src/io/ft_putuhex_fd.o b/libft/src/io/ft_putuhex_fd.o
new file mode 100644
index 0000000..741d2d5
Binary files /dev/null and b/libft/src/io/ft_putuhex_fd.o differ
diff --git a/libft/src/linked_lists/ft_lstadd_back.o b/libft/src/linked_lists/ft_lstadd_back.o
new file mode 100644
index 0000000..332fcc0
Binary files /dev/null and b/libft/src/linked_lists/ft_lstadd_back.o differ
diff --git a/libft/src/linked_lists/ft_lstadd_front.o b/libft/src/linked_lists/ft_lstadd_front.o
new file mode 100644
index 0000000..6077ac6
Binary files /dev/null and b/libft/src/linked_lists/ft_lstadd_front.o differ
diff --git a/libft/src/linked_lists/ft_lstclear.o b/libft/src/linked_lists/ft_lstclear.o
new file mode 100644
index 0000000..1274a51
Binary files /dev/null and b/libft/src/linked_lists/ft_lstclear.o differ
diff --git a/libft/src/linked_lists/ft_lstdelone.o b/libft/src/linked_lists/ft_lstdelone.o
new file mode 100644
index 0000000..74a38d0
Binary files /dev/null and b/libft/src/linked_lists/ft_lstdelone.o differ
diff --git a/libft/src/linked_lists/ft_lstiter.o b/libft/src/linked_lists/ft_lstiter.o
new file mode 100644
index 0000000..961b120
Binary files /dev/null and b/libft/src/linked_lists/ft_lstiter.o differ
diff --git a/libft/src/linked_lists/ft_lstlast.o b/libft/src/linked_lists/ft_lstlast.o
new file mode 100644
index 0000000..51cb2ac
Binary files /dev/null and b/libft/src/linked_lists/ft_lstlast.o differ
diff --git a/libft/src/linked_lists/ft_lstmap.o b/libft/src/linked_lists/ft_lstmap.o
new file mode 100644
index 0000000..1417e1a
Binary files /dev/null and b/libft/src/linked_lists/ft_lstmap.o differ
diff --git a/libft/src/linked_lists/ft_lstnew.o b/libft/src/linked_lists/ft_lstnew.o
new file mode 100644
index 0000000..7a3def1
Binary files /dev/null and b/libft/src/linked_lists/ft_lstnew.o differ
diff --git a/libft/src/linked_lists/ft_lstsize.o b/libft/src/linked_lists/ft_lstsize.o
new file mode 100644
index 0000000..87f5f8d
Binary files /dev/null and b/libft/src/linked_lists/ft_lstsize.o differ
diff --git a/libft/src/mem/ft_bzero.o b/libft/src/mem/ft_bzero.o
new file mode 100644
index 0000000..46e96b7
Binary files /dev/null and b/libft/src/mem/ft_bzero.o differ
diff --git a/libft/src/mem/ft_calloc.o b/libft/src/mem/ft_calloc.o
new file mode 100644
index 0000000..4fcbb49
Binary files /dev/null and b/libft/src/mem/ft_calloc.o differ
diff --git a/libft/src/mem/ft_free.o b/libft/src/mem/ft_free.o
new file mode 100644
index 0000000..ef24b91
Binary files /dev/null and b/libft/src/mem/ft_free.o differ
diff --git a/libft/src/mem/ft_memchr.o b/libft/src/mem/ft_memchr.o
new file mode 100644
index 0000000..e16206e
Binary files /dev/null and b/libft/src/mem/ft_memchr.o differ
diff --git a/libft/src/mem/ft_memcmp.o b/libft/src/mem/ft_memcmp.o
new file mode 100644
index 0000000..0e6b123
Binary files /dev/null and b/libft/src/mem/ft_memcmp.o differ
diff --git a/libft/src/mem/ft_memcpy.o b/libft/src/mem/ft_memcpy.o
new file mode 100644
index 0000000..a053a15
Binary files /dev/null and b/libft/src/mem/ft_memcpy.o differ
diff --git a/libft/src/mem/ft_memmove.o b/libft/src/mem/ft_memmove.o
new file mode 100644
index 0000000..270b88f
Binary files /dev/null and b/libft/src/mem/ft_memmove.o differ
diff --git a/libft/src/mem/ft_memset.o b/libft/src/mem/ft_memset.o
new file mode 100644
index 0000000..690e0b0
Binary files /dev/null and b/libft/src/mem/ft_memset.o differ
diff --git a/libft/src/stack/ft_stackadd_back.o b/libft/src/stack/ft_stackadd_back.o
new file mode 100644
index 0000000..e729a98
Binary files /dev/null and b/libft/src/stack/ft_stackadd_back.o differ
diff --git a/libft/src/stack/ft_stackadd_front.o b/libft/src/stack/ft_stackadd_front.o
new file mode 100644
index 0000000..2bd2ccd
Binary files /dev/null and b/libft/src/stack/ft_stackadd_front.o differ
diff --git a/libft/src/stack/ft_stacklast.o b/libft/src/stack/ft_stacklast.o
new file mode 100644
index 0000000..3b5fb3a
Binary files /dev/null and b/libft/src/stack/ft_stacklast.o differ
diff --git a/libft/src/stack/ft_stacknew.o b/libft/src/stack/ft_stacknew.o
new file mode 100644
index 0000000..f2aa7c9
Binary files /dev/null and b/libft/src/stack/ft_stacknew.o differ
diff --git a/libft/src/stack/ft_stacksize.o b/libft/src/stack/ft_stacksize.o
new file mode 100644
index 0000000..31e2e82
Binary files /dev/null and b/libft/src/stack/ft_stacksize.o differ
diff --git a/libft/src/str/XtoX/ft_atoi.o b/libft/src/str/XtoX/ft_atoi.o
new file mode 100644
index 0000000..6afd72e
Binary files /dev/null and b/libft/src/str/XtoX/ft_atoi.o differ
diff --git a/libft/src/str/XtoX/ft_atol.o b/libft/src/str/XtoX/ft_atol.o
new file mode 100644
index 0000000..0efbfca
Binary files /dev/null and b/libft/src/str/XtoX/ft_atol.o differ
diff --git a/libft/src/str/XtoX/ft_itoa.o b/libft/src/str/XtoX/ft_itoa.o
new file mode 100644
index 0000000..7592575
Binary files /dev/null and b/libft/src/str/XtoX/ft_itoa.o differ
diff --git a/libft/src/str/XtoX/ft_ltoa.o b/libft/src/str/XtoX/ft_ltoa.o
new file mode 100644
index 0000000..5370ff5
Binary files /dev/null and b/libft/src/str/XtoX/ft_ltoa.o differ
diff --git a/libft/src/str/ft_split.o b/libft/src/str/ft_split.o
new file mode 100644
index 0000000..d62a7b4
Binary files /dev/null and b/libft/src/str/ft_split.o differ
diff --git a/libft/src/str/ft_strchr.o b/libft/src/str/ft_strchr.o
new file mode 100644
index 0000000..37baa38
Binary files /dev/null and b/libft/src/str/ft_strchr.o differ
diff --git a/libft/src/str/ft_strcmp.o b/libft/src/str/ft_strcmp.o
new file mode 100644
index 0000000..f8beb08
Binary files /dev/null and b/libft/src/str/ft_strcmp.o differ
diff --git a/libft/src/str/ft_strdup.o b/libft/src/str/ft_strdup.o
new file mode 100644
index 0000000..667e2c6
Binary files /dev/null and b/libft/src/str/ft_strdup.o differ
diff --git a/libft/src/str/ft_striteri.o b/libft/src/str/ft_striteri.o
new file mode 100644
index 0000000..2a79c6f
Binary files /dev/null and b/libft/src/str/ft_striteri.o differ
diff --git a/libft/src/str/ft_strjoin.o b/libft/src/str/ft_strjoin.o
new file mode 100644
index 0000000..1c08d56
Binary files /dev/null and b/libft/src/str/ft_strjoin.o differ
diff --git a/libft/src/str/ft_strlcat.o b/libft/src/str/ft_strlcat.o
new file mode 100644
index 0000000..62a30d9
Binary files /dev/null and b/libft/src/str/ft_strlcat.o differ
diff --git a/libft/src/str/ft_strlcpy.o b/libft/src/str/ft_strlcpy.o
new file mode 100644
index 0000000..df47ed0
Binary files /dev/null and b/libft/src/str/ft_strlcpy.o differ
diff --git a/libft/src/str/ft_strlen.o b/libft/src/str/ft_strlen.o
new file mode 100644
index 0000000..99d8768
Binary files /dev/null and b/libft/src/str/ft_strlen.o differ
diff --git a/libft/src/str/ft_strmapi.o b/libft/src/str/ft_strmapi.o
new file mode 100644
index 0000000..2ab5d22
Binary files /dev/null and b/libft/src/str/ft_strmapi.o differ
diff --git a/libft/src/str/ft_strncmp.o b/libft/src/str/ft_strncmp.o
new file mode 100644
index 0000000..672c629
Binary files /dev/null and b/libft/src/str/ft_strncmp.o differ
diff --git a/libft/src/str/ft_strnstr.o b/libft/src/str/ft_strnstr.o
new file mode 100644
index 0000000..ecdbdf9
Binary files /dev/null and b/libft/src/str/ft_strnstr.o differ
diff --git a/libft/src/str/ft_strrchr.o b/libft/src/str/ft_strrchr.o
new file mode 100644
index 0000000..9b731b3
Binary files /dev/null and b/libft/src/str/ft_strrchr.o differ
diff --git a/libft/src/str/ft_strtrim.o b/libft/src/str/ft_strtrim.o
new file mode 100644
index 0000000..6692aef
Binary files /dev/null and b/libft/src/str/ft_strtrim.o differ
diff --git a/libft/src/str/ft_substr.o b/libft/src/str/ft_substr.o
new file mode 100644
index 0000000..7cfb836
Binary files /dev/null and b/libft/src/str/ft_substr.o differ
diff --git a/libft/src/str/ft_tolower.o b/libft/src/str/ft_tolower.o
new file mode 100644
index 0000000..c8e97a8
Binary files /dev/null and b/libft/src/str/ft_tolower.o differ
diff --git a/libft/src/str/ft_toupper.o b/libft/src/str/ft_toupper.o
new file mode 100644
index 0000000..fd137ad
Binary files /dev/null and b/libft/src/str/ft_toupper.o differ
diff --git a/minishell b/minishell
new file mode 100755
index 0000000..61ed6ef
Binary files /dev/null and b/minishell differ
diff --git a/obj/src/env_cmd.o b/obj/src/env_cmd.o
new file mode 100644
index 0000000..60939a1
Binary files /dev/null and b/obj/src/env_cmd.o differ
diff --git a/obj/src/main.o b/obj/src/main.o
new file mode 100644
index 0000000..2ff673c
Binary files /dev/null and b/obj/src/main.o differ
diff --git a/obj/src/prompt/get_hostname.o b/obj/src/prompt/get_hostname.o
new file mode 100644
index 0000000..4a83c9d
Binary files /dev/null and b/obj/src/prompt/get_hostname.o differ
diff --git a/obj/src/prompt/get_prompt.o b/obj/src/prompt/get_prompt.o
new file mode 100644
index 0000000..38af03c
Binary files /dev/null and b/obj/src/prompt/get_prompt.o differ
diff --git a/obj/src/prompt/get_pwd.o b/obj/src/prompt/get_pwd.o
new file mode 100644
index 0000000..8384267
Binary files /dev/null and b/obj/src/prompt/get_pwd.o differ
diff --git a/src/get_hostname.c b/src/get_hostname.c
deleted file mode 100644
index e69de29..0000000
diff --git a/src/main.c b/src/main.c
index 04da925..5aa9f62 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/24 11:18:04 by adjoly            #+#    #+#             */
-/*   Updated: 2024/04/30 12:40:35 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/05/02 15:47:34 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -30,61 +30,19 @@ bool	is_str(char *src, char *dst)
 	return (true);
 }
 
-/*char	*get_hostname(void)
-{
-	char	*hostname;
-	char	*tmp;
-	int		host_file;
-
-	//host_file = open();
-	tmp = hostname;
-	while (*tmp)
-		tmp++;
-	return
-}*/
-
-char	*get_prompt(void)
-{
-	char	**prompt;
-	char	*ret = NULL;
-	char	*home;
-	char	**tmp;
-
-	prompt = malloc(1000);
-	prompt[0] = getenv("USER");
-	prompt[1] = "@";
-	//prompt[2] = get_hostname();
-	home = getenv("HOME");
-	prompt[3] = getenv("PWD");
-	prompt[4] = ">";
-	//ret = ft_calloc(1000, sizeof(char));
-
-	if (!ft_strncmp(prompt[3], home, ft_strlen(home)))
-		prompt[3] += ft_strlen(home);
-	tmp = prompt;
-	while (*tmp)
-	{
-		ft_strlcat(ret, *tmp, ft_strlen(ret) + ft_strlen(*tmp) + 1);
-		tmp++;
-	}
-	free(prompt);
-	return (ret);
-}
-
 int	main(int ac, char **av, char **env)
 {
 	char	*test;
 	char	**lll;
-	char	*ret = NULL;
+	char	*prompt;
 
 	(void)ac;
 	(void)av;
 	(void)env;
 	while (1)
 	{
-		ret = get_prompt();
-		test = readline(ret);
-		free(ret);
+		prompt = get_prompt();
+		test = readline(prompt);
 		add_history(test);
 		lll = ft_split(test, ' ');
 		if (!*lll)
@@ -92,6 +50,6 @@ int	main(int ac, char **av, char **env)
 		if (is_str(test, "exit"))
 			break;
 	}
-	//ft_freearr((void **)lll);
+	//ft_free("a", &lll);
 	return (0);
 }
diff --git a/src/prompt/get_hostname.c b/src/prompt/get_hostname.c
new file mode 100644
index 0000000..dd70044
--- /dev/null
+++ b/src/prompt/get_hostname.c
@@ -0,0 +1,36 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   get_hostname.c                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/05/02 10:36:31 by adjoly            #+#    #+#             */
+/*   Updated: 2024/05/02 13:42:24 by adjoly           ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "fcntl.h"
+#include "libft.h"
+
+char	*get_hostname(void)
+{
+	char	*hostname;
+	char	*buf;
+	int		host_file;
+	char	*delimiter;
+
+	buf = ft_calloc(254, sizeof(char));
+	host_file = open("/etc/hostname", O_RDONLY);
+	read(host_file, buf, 254);
+	delimiter = ft_strchr(buf, '.');
+	if (!delimiter)
+	{
+		free(buf);
+		return (buf);
+	}
+	hostname = ft_calloc(delimiter - buf, sizeof(char));
+	ft_strlcpy(hostname, buf, delimiter - buf + 1);
+	free(buf);
+	return (hostname);
+}
diff --git a/src/get_prompt.c b/src/prompt/get_prompt.c
similarity index 54%
rename from src/get_prompt.c
rename to src/prompt/get_prompt.c
index 2fba489..210bc9b 100644
--- a/src/get_prompt.c
+++ b/src/prompt/get_prompt.c
@@ -6,49 +6,22 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/30 13:25:42 by adjoly            #+#    #+#             */
-/*   Updated: 2024/04/30 13:27:03 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/05/02 15:50:14 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-/*char	*get_hostname(void)
-{
-	char	*hostname;
-	char	*tmp;
-	int		host_file;
-
-	//host_file = open();
-	tmp = hostname;
-	while (*tmp)
-		tmp++;
-	return
-}*/
+#include "libft.h"
+#include "minishell.h"
 
 char	*get_prompt(void)
 {
-	char	**prompt;
-	char	*ret = NULL;
-	char	*home;
-	char	**tmp;
+	char	*prompt;
 
-	prompt = malloc(1000);
-	prompt[0] = getenv("USER");
-	prompt[1] = "@";
-	//prompt[2] = get_hostname();
-	home = getenv("HOME");
-	prompt[3] = getenv("PWD");
-	prompt[4] = ">";
-	//ret = ft_calloc(1000, sizeof(char));
-
-	if (!ft_strncmp(prompt[3], home, ft_strlen(home)))
-		prompt[3] += ft_strlen(home);
-	tmp = prompt;
-	while (*tmp)
-	{
-		ft_strlcat(ret, *tmp, ft_strlen(ret) + ft_strlen(*tmp) + 1);
-		tmp++;
-	}
-	free(prompt);
-	return (ret);
+	prompt = getenv("USER");
+	prompt = ft_strjoin(prompt, "@");
+	prompt = ft_strjoin_free(prompt, get_hostname());
+	prompt = ft_strjoin_free_s1(prompt, ":");
+	prompt = ft_strjoin_free(prompt, get_pwd());
+	prompt = ft_strjoin_free_s1(prompt, "$ ");
+	return (prompt);
 }
-
-
diff --git a/src/prompt/get_pwd.c b/src/prompt/get_pwd.c
new file mode 100644
index 0000000..905e368
--- /dev/null
+++ b/src/prompt/get_pwd.c
@@ -0,0 +1,27 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   get_pwd.c                                          :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/05/02 14:42:00 by adjoly            #+#    #+#             */
+/*   Updated: 2024/05/02 15:49:42 by adjoly           ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include <stdlib.h>
+#include "libft.h"
+
+char	*get_pwd(void)
+{
+	char	*pwd;
+	char	*home;
+
+	pwd = getenv("PWD");
+	home = getenv("HOME");
+	if (!ft_strncmp(pwd, home, ft_strlen(home)))
+		pwd += ft_strlen(home);
+	pwd = ft_strjoin("~", pwd);
+	return (pwd);
+}