Adds remainder of functionality per user stories