Backend / GUI refactoring continues