Comprehensive Water Bill Passes, Heads to Governor For Signature