Major code round-trip changes!

Synced all files with model.