WIP - working on improved position tracking