Extensible vocabulary

Next task: get these events out of here