Add supervisors to services

Closes #16