Added environment. No builtins though
Fixed tests
Added + and - builtin functions