Improve event to handle external interference

Also, code shuffling in preparation for handling multiple packets

(every day I'm shuffling)