Finish user stories #2 and #3