Minor refactoring
Hero State machine added. (Not working code)