Rewrite underway -- TH remains