Same goes here.  I think it might be cleaner for this to be in the service.