Camera stuff - fix it up later

Change-Id: Icbc7a2a7d4fba413a0adb9eb06618d513bc6563e