Major re-factoring of all event handlers