Added more camera things

These will be rejigged and renamed soon.  Also, I think the make file
needs fixing.  Probably.