Zoom rebase

Add all zoom functionality