flesh out the UI
Merge branch 'viz'