Add screen
Condense extras into loop
Correct service name error