moar stories and some refactoring