UI branch and some initial work