diff --git a/src/lisp/compiler.dasc b/src/lisp/compiler.dasc
index bfe74e1..a0b0236 100644
--- a/src/lisp/compiler.dasc
+++ b/src/lisp/compiler.dasc
@@ -981,6 +981,13 @@
 
 			| mov eax, (file_name_val);
 		}
+		else if (symstreq(val, "+current-env+"))
+		{
+			// TODO: we return this as a raw "integer", which is a bad
+			// idea. Once classes are added this needs to be wrapped
+			// in a class.
+			| mov eax, (env);
+		}
 		else
 		{
 			struct variable *v =
diff --git a/src/lisp/lib/std.c b/src/lisp/lib/std.c
index 1afe993..a0b7c78 100644
--- a/src/lisp/lib/std.c
+++ b/src/lisp/lib/std.c
@@ -1,5 +1,6 @@
 #include "std.h"
 #include "../gc.h"
+#include "../compiler.h"
 #include "../plat/plat.h"
 #include <stdlib.h>
 #include <string.h>
@@ -200,6 +201,22 @@
 					 nil));
 }
 
+value_t l_list_functions(value_t env)
+{
+	if (!integerp(env))
+		return nil;
+
+	struct environment *e = (void *)env;
+	value_t list = nil;
+
+	for (struct function *fun = e->first; fun; fun = fun->prev)
+	{
+		list = cons(symval(fun->name), list);
+	}
+
+	return list;
+}
+
 #define LISP_PREDICATE(name) value_t l_##name(value_t v) { return name(v) ? t : nil; }
 
 LISP_PREDICATE(listp)
@@ -243,6 +260,8 @@
 
 	add_c_function(env, "gc-stats", l_gc_stats, 0);
 
+	add_c_function(env, "env-functions", l_list_functions, 1);
+
 	if (!load_library(env, "std"))
 	{
 		fprintf(stderr, "Not found std\n");