(Crappy commit, saving changes swap branch)

In the middle of:
figuring out why logging is crashing so hard
getting the camera to owrk