Starting work on fixing Quantum ENet.
Merge branch 'origin/feature/enet'
Fix the energy net, needs extensive testing.