Finished first draft of homework 2