Created services to match repositories + unit tests (integration)
resolved conflicting filess
fixed changed dependancies