Adding missing files from last commit, also adds first update to UI
task. More to follow.