About to overhaul the movement to be vector based. Commit for safety.