Started refactor of narrative