first and second sprints functionalities ready for integration
 merges