Finished part 2 of assigment