Leaving subcontractor_truck stuff which was incomplete as is; Changing model relationships to accomodate changes to layout based on Judlau feedback from mockups.