got AJAX working full
Fixed merge