Added Story service
merged
more merging