Change notification code first cut, needs tests writing