Machines better utilize PowerProvider
Required energy abstraction
Merge pull request #246 from skyboy/master

Machines better utilize PowerProvider