Camino migration

This should be a single commit once shut-it-down is rebased :)