Refactored services a bit to not be separate.