WIP refactor AJAX notifications