Starting to properly sort out our orientation handling