Helpers Refactors

Clone of and resolves #2107 
DRATS, he got me