Updated camera code to prepare for movement processing

fixes #396