Refactors to put calculations in own methods. Drafts GUI.
Corrects previous commit by including GUI files
Change commandline to GUI. Not thoroughly tested.