More DCP.  Should be basically working, but needs a lot of polish.