first pass at moving the camera
merge latest changes