Datastore handover

These changes cover getting the query builder ready for 1.04 and the outstanding task for getting the code on the new url.

I'm not sure how you deploy it live