Refactoring WIP
1.1.0 release with lots of cleaning up
Implemented zoom