More work on uploader class
- temp CameraCapture for simulator