Start adding some of the other cspp components