Working on extending the functionality and test suite.