Merge origin/WithGUI into WithGUI
GUI stuff.
Merge origin/WithGUI into WithGUI