Completed HW4 + Bonus