Lots Of CHanges (again)
* Gui Work
* Clean up of TE code
* planned changes to how energy will work but well have to wait