Rework OD class and others to "prefer composition over inheritance". Tons class is now composed into OD class, not inherited. All calls to OD methods have been changed accordingly.