Refactored services, commencement on some desigh issues.