Finished the main code for hw 10, need to do testing