Beginning with the Service layer.
Fixing Service Layer.