WIP tiny bits of structural change to Camera update