Integrating the new feature into base code

This is a test to see how a merge brought forward might work.