Move stuff around in preparation for SI664 assignment.