implemented GUI
merged conflicts