Restructured to put lat/lon in a subdocument for easy spatial search/distance rank by postcocde