No Shortage of Water

I have been writing the past decade on water and measures to save every drop.
Today I have realised, actually there is No shortage of Water. 
What could be scarce in the future is  treated potable water.

So we need to draw up a plan to ensure we are able to harvest all water that strikes our land mass.
What falls on the mountains can be dammed
What falls on the plains need to be harvested and filtered for basic use
The rest to be harvested to raise the ground water table, and used for sundry purposes. viz: Public Toilets, Car Wash, General cleaning of establishments

Treated water to be metered for every apartment and used only for drinking purposes. 
This will ensure all get a fair share of drinking water