Majority of assn 1 complete

Got most tasks for Assn 1 completed, if rather ugly.