Added core services

Sorry for whitespace in diff. My editor hates you.