Started adding Camera code.
Merge origin/master