partial commit
all tests are now green