W8-A7  - working - all tests pass - needs to be cleaned up