I think swales should be part of the solution, sort of!