WIP on more camera modifications