Output Machines/Energy Storage additions

Preparing implementation.