asdf
Merge with diego
Gui implemented