Start of reworking camera
Include roll in orientation