the very start of the template based refactoring to make it go zoom
small changes
removed two unnecessary ints
Merge remote-tracking branch 'origin/master' into template-optimization
Merge branch 'master' into template-optimization
on this branch we're still doing quarter turn metric
Merging template-optimization into master.