add has_one association
add belongs_to association, change class arg to class_name for assocs
more data model conversion, still WIP