Camera working, for REAL. :D

Change-Id: I6c471939876c8e278359ebbd2262b0a4f0a329c1