Improve alignment with Matt's branch

[eileenmcnaughton]

Note I diverged on the handling of the throttle, moving it to a listener although am still testing the approach