started gui stuff
merged master into ch
popup text for the GUI