Partial commit
Implemented story 15