Prefer composition to inheritance is the mantra these das
Merge pull request #708 from artbristol/composition-not-inheritance

Prefer composition to inheritance