Added some AJAX but not all