Overlap events

Fixes #22 

#26 was merged into this to make testing easier.