Finished the user stories