W6-A5 cleaned up - all tests passing