Add story and token class
Fix conflicts