Putting Whychus Creek back on course