diff --git a/42sh/src/completion/c_seek_env.c b/42sh/src/completion/c_seek_env.c
new file mode 100644
index 00000000..d69eb6c4
--- /dev/null
+++ b/42sh/src/completion/c_seek_env.c
@@ -0,0 +1,55 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   c_seek_env.c                                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: gwojda <gwojda@student.42.fr>              +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2017/03/09 15:50:24 by gwojda            #+#    #+#             */
+/*   Updated: 2017/03/10 17:33:37 by gwojda           ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+
+static int	c_storing(t_comp *c, char *value)
+{
+	t_clst			*tmp;
+
+	if (!(tmp = (t_clst *)malloc(sizeof(t_clst))))
+		return (-1);
+	tmp->name = value;
+	tmp->len = ft_strlen(tmp->name);
+	tmp->type = 10;
+	tmp->cursor = 0;
+	c_add_to_lst(c, tmp);
+	return (0);
+}
+
+static void	c_maj_rcmd(t_comp *c, char *current_word)
+{
+	char	*tmp;
+
+	tmp = c->rcmd;
+	c->rcmd = ft_strdupi_w(current_word);
+	free(tmp);
+}
+
+int			c_seek_env(t_comp *c, char *current_word)
+{
+	char	*match;
+	char	**env;
+	int		i;
+
+	i = 0;
+	env = data_singleton()->env;
+	match = ft_strdupi_w(current_word + 1);
+	c_maj_rcmd(c, current_word);
+	while (env[i])
+	{
+		if (!ft_strncmp(match, env[i], ft_strlen(match)))
+			c_storing(c, ft_strndup(env[i], ft_strchr(env[i], '=') - env[i]));
+		++i;
+	}
+	return (0);
+}