v1.0.0 Refactor, working tests.