Finish user story #2 and #3