WIP refactoring, moving ctx
WIP change reuse API in accordance to real reuse optimizations
Fix merging fallout