Use a dedicated pointer for captures. Start refactoring
cleanup
Fix #2