semi-working service but not quite there yet
Back to working with the start of refactoring