WIP, closure convert is not working properly yet