WIP - closure-convert