refactor code, add STORY status!