Begin refactor incursion into service.py