First commit - migration of code from Doug and Jason to filter events