Refactor all the things
Merge pull request #2 from rogerhutchings/panzoom

Refactor all the things