More work done on the story generator