Started some working around notifications