MajorChanges

Major changes trying to get Panorama working