Using what seems to be a better model for calculating energy usage and voltage, and TESTS!