WIP improved ajaxifying