Move all state to GoalContainer