First impl of UI.
Merge branch 'master' into j-branch