Big clean up, featuring working odometry