Using GIS to Inform and Improve Water Flow Tracking