- Added some framework code for energy related things.