Trying out wrapper approach.
Code cleanup
Fix for mapper
Scaffolding changes
Lost
Update scaffold
Merge branch 'mapper' into minimum