Allow run.py to handle services as well as commands