Working on gui
merge