paul wheaton wrote:
Swales and or terraces are great stuff.
I have some concerns about when there is an abundance of water whether there are problems that are introduced. 
It is certainly a concern on this property. On the one hand I have no reason to water, ever. On the same hand I actually need to divert water off the property because there is just too much coming down.
Careful planning and doing things right the first time is all I can hope for.