Implemented and ready for testing

Implemented and ready for testing.