WIP factoring
Merge branch 'exec'