Derek/full story

We now have 80% test coverage.