Continued implementation of Services layer.