GUI added + TODO updated
merged