Merging GUI branch into Experimental

The GUI branch contains the MVP. It will be merged into Experimental before we start working in the GUI again for the final verison.