Story 2. Implemented.
Story 2.
Merged