Early work on moving to CCARPS, doesn't do anything yet