HW2 SUPER EXTRA CREDIT

This fulfills the requirements although it isn't as elegant so I had
hoped, so I will continue working on it.