GUI and rest of client working

- Merged refactored code with GUI
Thomas