In-progress work. A little bit better responsiveness.