Added reading stories and a little bit of refactoring.