More work on the CDP Decoder.