Cep18

This is *not* ready to be merged. I'm issuing a PR now so that we can begin the review process. Here you go, @scopatz, @rwcarlsen!