Merge pull request #23 from samm81/gui

MVP Testing