Tweaked some stuff in the GUI.
Re-Implemented (and tested, somewhat) the CLI