Working on GUI and TE
So close!