RAC-ifying more of the current camera code