initial commit gui refactor
merge conflict solved
compiles again