Add camera
merge and fix conflicts