Finished a few user stories