HW7 baseline

the rewrite wasn't working
will simplify old HW6 version
unit tests still not working