Almost done with domain and tuple changes.