Mmm, at the risk of over egging the pudding I was going to suggest adding fronts, sections, and then *counters* to all these.