Progress on water runner code