Removed my poor attempt at an energy network, Charles seems to know what he's doing... Included Waila, hopefully this will be nice and "symlink" to the bitbucket repo