Almost done with the GUI system, committing to check the diffs.