Milestone 1 working.
Merging. Minor changes to GUI.
Merging