Almost done... Need to update zooming and panning