working on the gui
merge