Rebuilt from scratch, true TDD, 100% func coverage