Restructured code to better fit with design doc. Added rally point markers.