HW2 Completed Along with Extra Credit