More WIP on closures