More compass stuff, still heavily WIP