implement userstory 2