w6a5 all tests passing - NEED TO CLEAN UP