Move #run from CLI to Server