Flushed out the hero class a little bit