Continued work on camera class