Yep no problem. If you will merge this rev I will mov it to protected, If not I think it makes sense to just bring it all up to its own class(es). I would prefer we merge this, and then move to refactor. As I have this code being used from my personal repo on some stuff now. Would like to update that to pointing at the canonical source.