Added all the water mac grid functions