Dcadams/cme registration

Note that this is NOT a PR into master

@sefk