Half finished moving import logic to custom fields rather than the
monolithic _import in the model object.
_import logic moved to fields, complete
Merge branch 'import_field_types'