Further CC work... making progress on discreteRV section