Move run task to class