Using this branch for notifications and stats