Remove unused method
Pass the environment into nested blocks
Fix enumeration
WIP