Adding Square name lookup and beginnings of Elastic Search