working onthe gui
merge