Surface and sub-surface drainage