Moved everything over to the Charge Handler system.
More code cleaning and simplifying.