Adds UserInterface stuff and tests mainly
conflict