Add new functionality and unit testing.