Working on the gui
merge