Implemented feature, and passing existing tests.