Add notes and events
Add remove() and removed() methods, but #ifdef'd out