Closures WIP 2 (task #45)