Planning for improvements to Gloucester's water supply underway