Building out more of the service classes and ITs