Completed the Position refactor