Major refactor to eliminate global services object;