ajaxing schtuff
fixing merge conflicts