Completed test coverage, time to add some new functionality.