rpearce/mshah: Favour composition over inheritance