Starting work on notification code and tests