Closed #53 and un-did the shitty CollectionEvents code I wrote on the plane.