HW_5 Redux

Homework 5 works correctly now