Ongoing development work

Continued development on capabilities currently in testing.