Completed asgn 1 and 2