big updates on the handler.. geocode added.