Implementing container class, some tweaks to hero.