Uncomment belongs to, add virtual field and beforeSave
Finish edit order and address