Rewrote events again! Filtered collections now working, all tests currently passing