Contribute Custom code back to core

While reviewing the AI code with Alain, we mentioned some of the code I have written is generic and can be contributed back to the core code base so others can re-use it.

I will create sub-tasks.