Helpers Refactors

Clone of and resolves #2107 
WE'LL PASS AN ACCUMULATOR!!! AND THEN WHAT ARE YOU GONNA DO GRAEME?!?!