Added code up to step 6 of asg2