Work in progress: Interface is beginning to feel like it should.