fix up grouping and chaining - stopped at unit 35