new events working, still no wildcards
All tests pass except for wildcards