Completed all code for filtering (except by location), adding events, etc.