Grady/reorder

Does this rely on the event handlers being installed and called in a certain order?