Test CDM v5 dataset

At the risk of having to ask for forgiveness, I merged our branch into the master branch this evening. It is ready to go.