Moved hero into its own class