WIP - do not add globals to closures