Code review for services/

Pretty sure I'm doing this wrong @zzmp, but here's the files I'd like you to review.
Why not inline this in L53?