Completed most user stories