Bring Back CameraWrapper

This reverts commit af501f09aaa78cb4bae1fb809c2164c82b6746f5.
Minor Cleanup