I missed this before - this event handling needs testing.