Added partial zoom support

Still some bugs