separation rules and other stuff
Add start of events framework
separation rules and other stuff
Merge branch 'master' into Ben
Merge branch 'master' into megan