full integration of CameraController

old code still present