SimpleClass.wyv now all works, all unit tests pass, time to tidy up!