finished moving civvilian controller business logic into the service
layer