Feature/cookbook updates

This is an import-only PR...