Most recent version I have.
Loading still not 100% complete, but is almost there. Charges are getting loaded and NET renamed to AverageNet for greater clarity
Revert "Most recent version I have."

This reverts commit 8a5c22e8b81088deee6515781102378da4fa8f3d.