Revamp of new energy network (not complete)
More work on energy network