Finished the main part of the assignment. Need to clean up