Added inline events

Let's discuss. Probably fine to merge, but we should doc it up!