lergo-339 first commit for GUI