Finish user story #2