City moves ahead on water project, budget