Final Commit for HW2