Move run into a service