GUIs && public->private + accompanying methods
Merging kevin & sophie with master; fixed merge conflicts
Fixed error in code after merge