Continuing to make progress. Just finished cleaning up IR_sensor.