Added more stories and more refactoring.