end of week 8, not quite perfect...
small changes to tests, not passing