Maybe we need @ggeisler to pull the branch and make UX suggestions