Skill refactoring. Can't get the states to run as I want.