Pairing with Brian Stevens to flesh out object model and do some UI tweaks.