WIP: Using list to represent environment
Removed substitution and lifting