addEvent cleaned up, i want filter to be on its own service