mostly working, no wildcards
new events working, still no wildcards
All tests pass except for wildcards
All tests passing
merged master
Merge pull request #11 from gaffa-tape/bubble-controll

Bubble controll