90% coverage, tests passing