delete unused method and add more tests
merge the story stuff