Revert "Revert "Improvements to charging""

Reverts strands-project/scitos_apps#123