refactoring
Implement new stories for 2nd iteration