Cleaned up some of the notification stuff I was using to debug. Versioned.