WIP - lots of work on scopes for closure variable capturing/referencing