Story 2

Implemented