Working on propagating environment through to closures