Major change: camera collision

Also updated some controls to work with the new camera collision.