Got the camera functionality working again

This solves the problem we had merging the branches.