Some structural changes to the dummy energy app.