68827294 recurring energy plus warnings

@asparke2 not sure if you normally deal with pull requests, but here you go.