Further hero unit stuff