Finishing up eventification and testing