Adding to stories.  Slightly refactored repository extensions.