Starting to re-work notification code