Tried to get zoom to work. Stopped due to performance considerations
zoom stuff as well
Merge branch 'zoom'