Rework of the DataManager

Tested and in production, in the process of breaking this out into it’s
own project.