location ajax stuff working
merge