Cleaned up branch
Merged with clean master branch, added back GUI started