This really needs to be done in an intermediate superclass!
All these changes really in previous revision; just missed typing in comments then.