HW1 Completed. Need to make it clean and efficient