Still working on test suite.