Added energy transport, still needs a bit of fixing