Now capture all the waterbodies appropriately. Still need to fix ascii output