1.7. Water management option

Working in progress