User story 01 solved