Update porting
Rename opts.
Begin clone port