Got notification code in, needs tested