HW6 initial changes

I guess I lost my HW5 additions, I thought I had them in HW4 oh well.
Just an initial stab at HW6.