Add todo
Working on closure serialization
tweak