fourth commit - finished all the required user stories