Issue 2: Implemented and ready for integration into master