Initial Commit forked out from notify- repo