merge gui

tryin out the interface