Camera refactor and some work to do 3.4.11