Better inheritance but not quite there