WIP: Closer to correcting orientation