Finished assignment 2 except for extra credit