diff --git a/data/ok/legislature/Aaron-Reinhardt-78900b72-692c-4b5f-ac8b-290577d6abd4.yml b/data/ok/legislature/Aaron-Reinhardt-78900b72-692c-4b5f-ac8b-290577d6abd4.yml
new file mode 100644
index 0000000000..78d10a59f2
--- /dev/null
+++ b/data/ok/legislature/Aaron-Reinhardt-78900b72-692c-4b5f-ac8b-290577d6abd4.yml
@@ -0,0 +1,19 @@
+id: ocd-person/78900b72-692c-4b5f-ac8b-290577d6abd4
+name: Aaron Reinhardt
+given_name: Aaron
+family_name: Reinhardt
+gender: Male
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/Aaron_Reinhardt_20241023_121244.jpeg
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '37'
+other_names:
+- name: A. Reinhardt
+- name: Reinhardt, A.
+sources:
+- url: https://ballotpedia.org/Aaron_Reinhardt
+- url: https://www.linkedin.com/in/aaron-reinhardt-5b7a6949
diff --git a/data/ok/legislature/Adam-Pugh-7e356581-ff96-4e5d-b6bc-94b3c8e0005c.yml b/data/ok/legislature/Adam-Pugh-7e356581-ff96-4e5d-b6bc-94b3c8e0005c.yml
index 2fd6fa1c77..b2fea59266 100644
--- a/data/ok/legislature/Adam-Pugh-7e356581-ff96-4e5d-b6bc-94b3c8e0005c.yml
+++ b/data/ok/legislature/Adam-Pugh-7e356581-ff96-4e5d-b6bc-94b3c8e0005c.yml
@@ -2,7 +2,7 @@ id: ocd-person/7e356581-ff96-4e5d-b6bc-94b3c8e0005c
 name: Adam Pugh
 given_name: Adam
 family_name: Pugh
-birth_date: '1977-10-12'
+birth_date: 1977-10-12
 gender: Male
 email: pugh@oksenate.gov
 image: https://oksenate.gov/sites/default/files/pugh.jpg
diff --git a/data/ok/legislature/Ajay-Pittman-719605ed-1748-4c0b-bc6a-79330db17af1.yml b/data/ok/legislature/Ajay-Pittman-719605ed-1748-4c0b-bc6a-79330db17af1.yml
index 0e5dd2cda9..ad613152d3 100644
--- a/data/ok/legislature/Ajay-Pittman-719605ed-1748-4c0b-bc6a-79330db17af1.yml
+++ b/data/ok/legislature/Ajay-Pittman-719605ed-1748-4c0b-bc6a-79330db17af1.yml
@@ -2,7 +2,7 @@ id: ocd-person/719605ed-1748-4c0b-bc6a-79330db17af1
 name: Ajay Pittman
 given_name: Ajay
 family_name: Pittman
-birth_date: '1993-09-10'
+birth_date: 1993-09-10
 gender: Female
 email: ajay.pittman@okhouse.gov
 image: https://www.okhouse.gov/Members/Pictures/HiRes/Ajay-Pittman.jpg
diff --git a/data/ok/retired/Avery-Frix-f2bc8c9d-050a-4531-84eb-1f233ad7042a.yml b/data/ok/legislature/Avery-Frix-f2bc8c9d-050a-4531-84eb-1f233ad7042a.yml
similarity index 62%
rename from data/ok/retired/Avery-Frix-f2bc8c9d-050a-4531-84eb-1f233ad7042a.yml
rename to data/ok/legislature/Avery-Frix-f2bc8c9d-050a-4531-84eb-1f233ad7042a.yml
index 225fa82f7c..e995a8ca09 100644
--- a/data/ok/retired/Avery-Frix-f2bc8c9d-050a-4531-84eb-1f233ad7042a.yml
+++ b/data/ok/legislature/Avery-Frix-f2bc8c9d-050a-4531-84eb-1f233ad7042a.yml
@@ -2,12 +2,16 @@ id: ocd-person/f2bc8c9d-050a-4531-84eb-1f233ad7042a
 name: Avery Frix
 given_name: Avery
 family_name: Frix
-email: avery.frix@okhouse.gov
+gender: Male
 image: https://www.okhouse.gov/Members/Pictures/HiRes/Frix,%20Avery.jpg
 party:
 - name: Republican
 roles:
-- end_date: '2022-11-23'
+- start_date: 2024-11-20
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '9'
+- end_date: 2022-11-23
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '13'
@@ -15,10 +19,18 @@ links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=13
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=13
   note: Contact Form
+other_names:
+- name: A. Frix
+- name: A.C. Frix
+- name: Frix, A.
 other_identifiers:
 - scheme: legacy_openstates
   identifier: OKL000281
 sources:
+- url: https://ballotpedia.org/Avery_Carl_Frix
+- url: https://en.wikipedia.org/wiki/Avery_Frix
+- url: https://justfacts.votesmart.org/candidate/biography/170752/avery-frix
+- url: https://www.linkedin.com/in/avery-frix-795a4a58
 - url: https://www.okhouse.gov/Members/Default.aspx
 - url: https://www.okhouse.gov/Members/District.aspx?District=13
 extras:
diff --git a/data/ok/legislature/Bob-Culver-246cfe54-edbd-4844-9bdc-0213c4b501e9.yml b/data/ok/legislature/Bob-Culver-246cfe54-edbd-4844-9bdc-0213c4b501e9.yml
index 9309749095..5a55c7ee3b 100644
--- a/data/ok/legislature/Bob-Culver-246cfe54-edbd-4844-9bdc-0213c4b501e9.yml
+++ b/data/ok/legislature/Bob-Culver-246cfe54-edbd-4844-9bdc-0213c4b501e9.yml
@@ -2,7 +2,7 @@ id: ocd-person/246cfe54-edbd-4844-9bdc-0213c4b501e9
 name: Bob Culver
 given_name: Bob
 family_name: Culver
-birth_date: '1957-12-16'
+birth_date: 1957-12-16
 gender: Male
 email: bob.culver@okhouse.gov
 image: https://www.okhouse.gov/Members/Pictures/HiRes/Culver,%20BobEd.jpg
diff --git a/data/ok/legislature/Brenda-Stanley-55b572a7-2951-4597-b70c-e37b51163b03.yml b/data/ok/legislature/Brenda-Stanley-55b572a7-2951-4597-b70c-e37b51163b03.yml
index 775da8d0b9..d6b0d5e692 100644
--- a/data/ok/legislature/Brenda-Stanley-55b572a7-2951-4597-b70c-e37b51163b03.yml
+++ b/data/ok/legislature/Brenda-Stanley-55b572a7-2951-4597-b70c-e37b51163b03.yml
@@ -2,7 +2,7 @@ id: ocd-person/55b572a7-2951-4597-b70c-e37b51163b03
 name: Brenda Stanley
 given_name: Brenda
 family_name: Stanley
-birth_date: '1952-02-10'
+birth_date: 1952-02-10
 gender: Female
 email: brenda.stanley@oksenate.gov
 image: https://oksenate.gov/sites/default/files/Brenda-Stanley_1.jpg
diff --git a/data/ok/legislature/Brian-Guthrie-19a4841c-4571-4803-8f5d-262f664fb31a.yml b/data/ok/legislature/Brian-Guthrie-19a4841c-4571-4803-8f5d-262f664fb31a.yml
new file mode 100644
index 0000000000..4243870ac8
--- /dev/null
+++ b/data/ok/legislature/Brian-Guthrie-19a4841c-4571-4803-8f5d-262f664fb31a.yml
@@ -0,0 +1,22 @@
+id: ocd-person/19a4841c-4571-4803-8f5d-262f664fb31a
+name: Brian Guthrie
+given_name: Brian
+family_name: Guthrie
+gender: Male
+image: https://bloximages.newyork1.vip.townnews.com/citynewsokc.com/content/tncms/assets/v3/editorial/5/d2/5d26a700-4e64-11ee-be35-db82e824c57c/64fb4b329045b.image.jpg?resize=500%2C500
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '25'
+other_names:
+- name: B. Guthrie
+- name: B.O. Guthrie
+- name: Guthrie, B.
+sources:
+- url: https://ballotpedia.org/Brian_Guthrie
+- url: https://en.wikipedia.org/wiki/Brian_Guthrie
+- url: https://justfacts.votesmart.org/candidate/216436/brian-guthrie
+- url: https://www.linkedin.com/in/brianguthrierealtor
diff --git a/data/ok/legislature/Chris-Sneed-f4d5b128-a016-4eda-b6c6-e298fe29bc29.yml b/data/ok/legislature/Chris-Sneed-f4d5b128-a016-4eda-b6c6-e298fe29bc29.yml
index 86f08d30cf..8be1418691 100644
--- a/data/ok/legislature/Chris-Sneed-f4d5b128-a016-4eda-b6c6-e298fe29bc29.yml
+++ b/data/ok/legislature/Chris-Sneed-f4d5b128-a016-4eda-b6c6-e298fe29bc29.yml
@@ -2,7 +2,7 @@ id: ocd-person/f4d5b128-a016-4eda-b6c6-e298fe29bc29
 name: Chris Sneed
 given_name: Chris
 family_name: Sneed
-birth_date: '1977-12-22'
+birth_date: 1977-12-22
 gender: Male
 email: chris.sneed@okhouse.gov
 image: https://www.okhouse.gov/Members/Pictures/HiRes/Sneed,%20Chris.jpg
diff --git a/data/ok/legislature/Christi-Gillespie-b8b4337f-5741-4fad-bcf3-38c526cf6c5a.yml b/data/ok/legislature/Christi-Gillespie-b8b4337f-5741-4fad-bcf3-38c526cf6c5a.yml
new file mode 100644
index 0000000000..1b9d3263ee
--- /dev/null
+++ b/data/ok/legislature/Christi-Gillespie-b8b4337f-5741-4fad-bcf3-38c526cf6c5a.yml
@@ -0,0 +1,21 @@
+id: ocd-person/b8b4337f-5741-4fad-bcf3-38c526cf6c5a
+name: Christi Gillespie
+given_name: Christi
+family_name: Gillespie
+gender: Female
+image: https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQgg9y84-E8FaeDWzhd1s97N3Ko90lCow4sAQ&s
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '33'
+other_names:
+- name: C. Gillespie
+- name: C.D. Gillespie
+- name: Gillespie, C.
+sources:
+- url: https://ballotpedia.org/Christi_Gillespie
+- url: https://justfacts.votesmart.org/candidate/biography/187619/christi-gillespie
+- url: https://www.linkedin.com/in/christig
diff --git a/data/ok/legislature/Cyndi-Munson-f9153735-938a-418b-ac4f-6881904861ac.yml b/data/ok/legislature/Cyndi-Munson-f9153735-938a-418b-ac4f-6881904861ac.yml
index 0c8a92a632..0c92a75adb 100644
--- a/data/ok/legislature/Cyndi-Munson-f9153735-938a-418b-ac4f-6881904861ac.yml
+++ b/data/ok/legislature/Cyndi-Munson-f9153735-938a-418b-ac4f-6881904861ac.yml
@@ -2,7 +2,7 @@ id: ocd-person/f9153735-938a-418b-ac4f-6881904861ac
 name: Cyndi Munson
 given_name: Cyndi
 family_name: Munson
-birth_date: '1985-05-24'
+birth_date: 1985-05-24
 gender: Female
 email: cyndi.munson@okhouse.gov
 image: https://www.okhouse.gov/Members/Pictures/HiRes/Munson,%20Cyndie.jpg
diff --git a/data/ok/legislature/Darcy-Jech-7143be5e-df9e-40ad-8591-dd4c9ea51261.yml b/data/ok/legislature/Darcy-Jech-7143be5e-df9e-40ad-8591-dd4c9ea51261.yml
index 15e182f49a..6fccafb913 100644
--- a/data/ok/legislature/Darcy-Jech-7143be5e-df9e-40ad-8591-dd4c9ea51261.yml
+++ b/data/ok/legislature/Darcy-Jech-7143be5e-df9e-40ad-8591-dd4c9ea51261.yml
@@ -2,7 +2,7 @@ id: ocd-person/7143be5e-df9e-40ad-8591-dd4c9ea51261
 name: Darcy Jech
 given_name: Darcy
 family_name: Jech
-birth_date: '1957-09-30'
+birth_date: 1957-09-30
 gender: Male
 email: darcy.jech@oksenate.gov
 image: https://oksenate.gov/sites/default/files/1200px-DarcyJech_0.jpg
diff --git a/data/ok/legislature/Darrell-Weaver-bea1fd3e-9a8e-4cd6-bdb8-abedd9f8a888.yml b/data/ok/legislature/Darrell-Weaver-bea1fd3e-9a8e-4cd6-bdb8-abedd9f8a888.yml
index 035e7cbbea..bd617ab694 100644
--- a/data/ok/legislature/Darrell-Weaver-bea1fd3e-9a8e-4cd6-bdb8-abedd9f8a888.yml
+++ b/data/ok/legislature/Darrell-Weaver-bea1fd3e-9a8e-4cd6-bdb8-abedd9f8a888.yml
@@ -2,7 +2,7 @@ id: ocd-person/bea1fd3e-9a8e-4cd6-bdb8-abedd9f8a888
 name: Darrell Weaver
 given_name: Darrell
 family_name: Weaver
-birth_date: '1962-03-15'
+birth_date: 1962-03-15
 gender: Male
 email: darrell.weaver@oksenate.gov
 image: https://oksenate.gov/sites/default/files/Weaver%2C%20Darrell_flags.jpg
diff --git a/data/ok/legislature/Dave-Rader-3714523f-ea6d-4bd5-a801-1397dd508208.yml b/data/ok/legislature/Dave-Rader-3714523f-ea6d-4bd5-a801-1397dd508208.yml
index 7459c130c8..6bd6f1d2b1 100644
--- a/data/ok/legislature/Dave-Rader-3714523f-ea6d-4bd5-a801-1397dd508208.yml
+++ b/data/ok/legislature/Dave-Rader-3714523f-ea6d-4bd5-a801-1397dd508208.yml
@@ -2,7 +2,7 @@ id: ocd-person/3714523f-ea6d-4bd5-a801-1397dd508208
 name: Dave Rader
 given_name: Dave
 family_name: Rader
-birth_date: '1957-03-09'
+birth_date: 1957-03-09
 gender: Male
 email: rader@oksenate.gov
 image: https://oksenate.gov/sites/default/files/Rader%2C%20Dave%20Flags%202022.jpg
diff --git a/data/ok/legislature/Derrick-Hildebrant-a7eb5f03-0a2a-4235-b2f8-b4983e1a8cf2.yml b/data/ok/legislature/Derrick-Hildebrant-a7eb5f03-0a2a-4235-b2f8-b4983e1a8cf2.yml
new file mode 100644
index 0000000000..bf9346e8d6
--- /dev/null
+++ b/data/ok/legislature/Derrick-Hildebrant-a7eb5f03-0a2a-4235-b2f8-b4983e1a8cf2.yml
@@ -0,0 +1,22 @@
+id: ocd-person/a7eb5f03-0a2a-4235-b2f8-b4983e1a8cf2
+name: Derrick Hildebrant
+given_name: Derrick
+family_name: Hildebrant
+gender: Male
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/DerrickHildebrant2024.jpg
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '23'
+other_names:
+- name: D. Hildebrant
+- name: D.R. Hildebrant
+- name: Hildebrant, D.
+sources:
+- url: https://ballotpedia.org/Derrick_Hildebrant
+- url: https://en.wikipedia.org/wiki/Derrick_Hildebrant
+- url: https://justfacts.votesmart.org/candidate/216477/derrick-hildebrant
+- url: https://www.linkedin.com/in/derrick-hildebrant-241913b1
diff --git a/data/ok/legislature/Ellen-Pogemiller-c63ddc9a-5f9d-4cb5-b152-4828f4870682.yml b/data/ok/legislature/Ellen-Pogemiller-c63ddc9a-5f9d-4cb5-b152-4828f4870682.yml
new file mode 100644
index 0000000000..1500f98dc6
--- /dev/null
+++ b/data/ok/legislature/Ellen-Pogemiller-c63ddc9a-5f9d-4cb5-b152-4828f4870682.yml
@@ -0,0 +1,20 @@
+id: ocd-person/c63ddc9a-5f9d-4cb5-b152-4828f4870682
+name: Ellen Pogemiller
+given_name: Ellen
+family_name: Pogemiller
+gender: Female
+image: https://static.wixstatic.com/media/d59798_0699f998a916470598404706be4aca74~mv2.jpg/v1/fill/w_1349,h_1019,al_c,q_85,usm_0.66_1.00_0.01,enc_auto/d59798_0699f998a916470598404706be4aca74~mv2.jpg
+party:
+- name: Democratic
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '88'
+other_names:
+- name: E. Pogemiller
+- name: E.C. Pogemiller
+- name: Pogemiller, E.
+sources:
+- url: https://ballotpedia.org/Ellen_Pogemiller
+- url: https://www.linkedin.com/in/ellen-pogemiller-631a03ba
diff --git a/data/ok/legislature/Emily-Gise-09b3acaf-ac32-4f74-9bfe-37d84beb09c8.yml b/data/ok/legislature/Emily-Gise-09b3acaf-ac32-4f74-9bfe-37d84beb09c8.yml
new file mode 100644
index 0000000000..9558b44a82
--- /dev/null
+++ b/data/ok/legislature/Emily-Gise-09b3acaf-ac32-4f74-9bfe-37d84beb09c8.yml
@@ -0,0 +1,21 @@
+id: ocd-person/09b3acaf-ac32-4f74-9bfe-37d84beb09c8
+name: Emily Gise
+given_name: Emily
+family_name: Gise
+gender: Female
+image: https://www.cairoklahoma.com/wp-content/uploads/2024/09/emily-200x200.jpeg
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '90'
+other_names:
+- name: E. Gise
+- name: E.G. Gise
+- name: Gise, E.
+sources:
+- url: https://ballotpedia.org/Emily_Gise
+- url: https://justfacts.votesmart.org/candidate/biography/216601/emily-gise
+- url: https://www.linkedin.com/in/emilygise
diff --git a/data/ok/legislature/Forrest-Bennett-a6cd0df4-10a8-4dd8-a887-763e2aebcac2.yml b/data/ok/legislature/Forrest-Bennett-a6cd0df4-10a8-4dd8-a887-763e2aebcac2.yml
index e8baa7220e..fc3a18fbe8 100644
--- a/data/ok/legislature/Forrest-Bennett-a6cd0df4-10a8-4dd8-a887-763e2aebcac2.yml
+++ b/data/ok/legislature/Forrest-Bennett-a6cd0df4-10a8-4dd8-a887-763e2aebcac2.yml
@@ -2,7 +2,7 @@ id: ocd-person/a6cd0df4-10a8-4dd8-a887-763e2aebcac2
 name: Forrest Bennett
 given_name: Forrest
 family_name: Bennett
-birth_date: '1989-08-13'
+birth_date: 1989-08-13
 gender: Male
 email: forrest.bennett@okhouse.gov
 image: https://www.okhouse.gov/Members/Pictures/HiRes/Bennett,%20Forrest.jpg
diff --git a/data/ok/legislature/Gabe-Woolley-b0168a8a-bf16-4ddb-85ef-a7503cdb4d66.yml b/data/ok/legislature/Gabe-Woolley-b0168a8a-bf16-4ddb-85ef-a7503cdb4d66.yml
new file mode 100644
index 0000000000..ec7dfb83e4
--- /dev/null
+++ b/data/ok/legislature/Gabe-Woolley-b0168a8a-bf16-4ddb-85ef-a7503cdb4d66.yml
@@ -0,0 +1,22 @@
+id: ocd-person/b0168a8a-bf16-4ddb-85ef-a7503cdb4d66
+name: Gabe Woolley
+given_name: Gabe
+family_name: Woolley
+birth_date: 1994-09-17
+gender: Male
+image: https://www.cairoklahoma.com/wp-content/uploads/2024/06/gabe-960x958.jpg
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '98'
+other_names:
+- name: G. Woolley
+- name: G.C. Woolley
+- name: Woolley, G.
+sources:
+- url: https://ballotpedia.org/Gabe_Woolley
+- url: https://justfacts.votesmart.org/candidate/216596/gabe-woolley
+- url: https://www.linkedin.com/in/gabe-woolley-08161151
diff --git a/data/ok/legislature/Jason-Blair-a791f43c-0ca9-42aa-b90a-98968718a7e1.yml b/data/ok/legislature/Jason-Blair-a791f43c-0ca9-42aa-b90a-98968718a7e1.yml
new file mode 100644
index 0000000000..34ea73c5d7
--- /dev/null
+++ b/data/ok/legislature/Jason-Blair-a791f43c-0ca9-42aa-b90a-98968718a7e1.yml
@@ -0,0 +1,21 @@
+id: ocd-person/a791f43c-0ca9-42aa-b90a-98968718a7e1
+name: Jason Blair
+given_name: Jason
+family_name: Blair
+gender: Male
+image: https://www.oklahoman.com/gcdn/authoring/authoring-images/2024/06/10/NOKL/74049882007-jason-blair.jpg?width=300&height=366&fit=crop&format=pjpg&auto=webp
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '53'
+other_names:
+- name: J. Blair
+- name: J.D. Blair
+- name: Blair, J.
+sources:
+- url: https://ballotpedia.org/Jason_Blair
+- url: https://justfacts.votesmart.org/candidate/112523/jason-blair
+- url: https://www.linkedin.com/in/jason-blair
diff --git a/data/ok/legislature/Jim-Grego-612db560-defe-471a-a45f-cf259a4ffeaa.yml b/data/ok/legislature/Jim-Grego-612db560-defe-471a-a45f-cf259a4ffeaa.yml
index ae7819ca33..c7a701f317 100644
--- a/data/ok/legislature/Jim-Grego-612db560-defe-471a-a45f-cf259a4ffeaa.yml
+++ b/data/ok/legislature/Jim-Grego-612db560-defe-471a-a45f-cf259a4ffeaa.yml
@@ -2,7 +2,7 @@ id: ocd-person/612db560-defe-471a-a45f-cf259a4ffeaa
 name: Jim Grego
 given_name: Jim
 family_name: Grego
-birth_date: '1955-11-08'
+birth_date: 1955-11-08
 gender: Male
 email: jim.grego@okhouse.gov
 image: https://www.okhouse.gov/Members/Pictures/HiRes/Grego,%20Jim.jpg
diff --git a/data/ok/legislature/Jim-Shaw-df9c291c-e14f-487a-8ff6-9182734ababf.yml b/data/ok/legislature/Jim-Shaw-df9c291c-e14f-487a-8ff6-9182734ababf.yml
new file mode 100644
index 0000000000..fa14d1b72c
--- /dev/null
+++ b/data/ok/legislature/Jim-Shaw-df9c291c-e14f-487a-8ff6-9182734ababf.yml
@@ -0,0 +1,19 @@
+id: ocd-person/df9c291c-e14f-487a-8ff6-9182734ababf
+name: Jim Shaw
+given_name: Jim
+family_name: Shaw
+gender: Male
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/JimShaw2.jpg
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '32'
+other_names:
+- name: J. Shaw
+- name: Shaw, J.
+sources:
+- url: https://ballotpedia.org/Jim_Shaw_(Oklahoma)
+- url: https://www.linkedin.com/in/jim-shaw-28074723
diff --git a/data/ok/legislature/John-Pfeiffer-671bd947-18c8-4b39-906e-675209b80b73.yml b/data/ok/legislature/John-Pfeiffer-671bd947-18c8-4b39-906e-675209b80b73.yml
index 31038872c5..64cb9807ee 100644
--- a/data/ok/legislature/John-Pfeiffer-671bd947-18c8-4b39-906e-675209b80b73.yml
+++ b/data/ok/legislature/John-Pfeiffer-671bd947-18c8-4b39-906e-675209b80b73.yml
@@ -2,7 +2,7 @@ id: ocd-person/671bd947-18c8-4b39-906e-675209b80b73
 name: John Pfeiffer
 given_name: John
 family_name: Pfeiffer
-birth_date: '1986-05-09'
+birth_date: 1986-05-09
 gender: Male
 email: john.pfeiffer@okhouse.gov
 image: https://www.okhouse.gov/Members/Pictures/HiRes/Pfeiffer,%20John.JPG
diff --git a/data/ok/legislature/Jonathan-Wilk-d8c6a83e-cdac-439d-af83-d90d9f543541.yml b/data/ok/legislature/Jonathan-Wilk-d8c6a83e-cdac-439d-af83-d90d9f543541.yml
new file mode 100644
index 0000000000..55fa87d737
--- /dev/null
+++ b/data/ok/legislature/Jonathan-Wilk-d8c6a83e-cdac-439d-af83-d90d9f543541.yml
@@ -0,0 +1,21 @@
+id: ocd-person/d8c6a83e-cdac-439d-af83-d90d9f543541
+name: Jonathan Wilk
+given_name: Jonathan
+family_name: Wilk
+gender: Male
+image: https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSQcSK-0G7vutoYpyD-I4rn3EZVvTgV8ij17A&s
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '20'
+other_names:
+- name: J. Wilk
+- name: J.M. Wilk
+- name: Wilk, J.
+sources:
+- url: https://ballotpedia.org/Jonathan_Wilk
+- url: https://justfacts.votesmart.org/candidate/biography/216470/jonathan-wilk
+- url: https://www.linkedin.com/in/jonathan-wilk-53305b102
diff --git a/data/ok/legislature/Jonathan-Wingard-077e2743-495e-4198-a096-5675796d78a4.yml b/data/ok/legislature/Jonathan-Wingard-077e2743-495e-4198-a096-5675796d78a4.yml
new file mode 100644
index 0000000000..6a62b12730
--- /dev/null
+++ b/data/ok/legislature/Jonathan-Wingard-077e2743-495e-4198-a096-5675796d78a4.yml
@@ -0,0 +1,17 @@
+id: ocd-person/077e2743-495e-4198-a096-5675796d78a4
+name: Jonathan Wingard
+given_name: Jonathan
+family_name: Wingard
+gender: Male
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/JonathanWingard2024.png
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '13'
+other_names:
+- name: J. Wingard
+- name: Wingard, J.
+sources: []
diff --git a/data/ok/legislature/Julia-Kirt-986cbe76-2b10-4fc8-92b0-39432b761e1a.yml b/data/ok/legislature/Julia-Kirt-986cbe76-2b10-4fc8-92b0-39432b761e1a.yml
index b9afd59acd..42f7581e87 100644
--- a/data/ok/legislature/Julia-Kirt-986cbe76-2b10-4fc8-92b0-39432b761e1a.yml
+++ b/data/ok/legislature/Julia-Kirt-986cbe76-2b10-4fc8-92b0-39432b761e1a.yml
@@ -2,7 +2,7 @@ id: ocd-person/986cbe76-2b10-4fc8-92b0-39432b761e1a
 name: Julia Kirt
 given_name: Julia
 family_name: Kirt
-birth_date: '1973-10-07'
+birth_date: 1973-10-07
 gender: Female
 email: julia.kirt@oksenate.gov
 image: https://oksenate.gov/sites/default/files/Kirt%2C%20Julia%202023%20Flags%20S.jpg
diff --git a/data/ok/legislature/Julie-Daniels-14ac3593-aa7a-491e-aba0-93474e93673d.yml b/data/ok/legislature/Julie-Daniels-14ac3593-aa7a-491e-aba0-93474e93673d.yml
index 975172849b..a9832b38a4 100644
--- a/data/ok/legislature/Julie-Daniels-14ac3593-aa7a-491e-aba0-93474e93673d.yml
+++ b/data/ok/legislature/Julie-Daniels-14ac3593-aa7a-491e-aba0-93474e93673d.yml
@@ -2,7 +2,7 @@ id: ocd-person/14ac3593-aa7a-491e-aba0-93474e93673d
 name: Julie Daniels
 given_name: Julie
 family_name: Daniels
-birth_date: '1954-02-12'
+birth_date: 1954-02-12
 gender: Female
 email: julie.daniels@oksenate.gov
 image: https://oksenate.gov/sites/default/files/Daniels%2C%20Julie%202022.jpg
diff --git a/data/ok/legislature/Julie-McIntosh-3219df30-79cf-43c5-814d-b1f4b02d53bb.yml b/data/ok/legislature/Julie-McIntosh-3219df30-79cf-43c5-814d-b1f4b02d53bb.yml
new file mode 100644
index 0000000000..9b5b60cb7e
--- /dev/null
+++ b/data/ok/legislature/Julie-McIntosh-3219df30-79cf-43c5-814d-b1f4b02d53bb.yml
@@ -0,0 +1,19 @@
+id: ocd-person/3219df30-79cf-43c5-814d-b1f4b02d53bb
+name: Julie McIntosh
+given_name: Julie
+family_name: McIntosh
+gender: Female
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/JulieMcIntosh2024.jpeg
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '3'
+other_names:
+- name: J. McIntosh
+- name: McIntosh, J.
+sources:
+- url: https://ballotpedia.org/Julie_McIntosh
+- url: https://en.wikipedia.org/wiki/Julie_McIntosh
diff --git a/data/ok/legislature/Justin-Humphrey-0b9df925-a78c-4ee4-a58c-5d7c2ace10fd.yml b/data/ok/legislature/Justin-Humphrey-0b9df925-a78c-4ee4-a58c-5d7c2ace10fd.yml
index 60892010b3..641e46d199 100644
--- a/data/ok/legislature/Justin-Humphrey-0b9df925-a78c-4ee4-a58c-5d7c2ace10fd.yml
+++ b/data/ok/legislature/Justin-Humphrey-0b9df925-a78c-4ee4-a58c-5d7c2ace10fd.yml
@@ -2,7 +2,7 @@ id: ocd-person/0b9df925-a78c-4ee4-a58c-5d7c2ace10fd
 name: Justin Humphrey
 given_name: Justin
 family_name: Humphrey
-birth_date: '1966-08-17'
+birth_date: 1966-08-17
 gender: Male
 email: justin.humphrey@okhouse.gov
 image: https://www.okhouse.gov/Members/Pictures/HiRes/Humphrey,%20Justin.jpg
diff --git a/data/ok/legislature/Kelly-Hines-595024d3-b5fd-45e4-a980-4774f531d051.yml b/data/ok/legislature/Kelly-Hines-595024d3-b5fd-45e4-a980-4774f531d051.yml
new file mode 100644
index 0000000000..8b4a75cc43
--- /dev/null
+++ b/data/ok/legislature/Kelly-Hines-595024d3-b5fd-45e4-a980-4774f531d051.yml
@@ -0,0 +1,20 @@
+id: ocd-person/595024d3-b5fd-45e4-a980-4774f531d051
+name: Kelly Hines
+given_name: Kelly
+family_name: Hines
+gender: Male
+image: https://images.squarespace-cdn.com/content/v1/642c607b85563b44f0aa5800/5c9a6226-10da-4b2b-848d-746244b9e4ad/headshot+%28002%29.jpg
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '47'
+other_names:
+- name: K. Hines
+- name: K.E. Hines
+- name: Hines, K.
+sources:
+- url: https://ballotpedia.org/Kelly_Hines
+- url: https://www.linkedin.com/in/kelly-hines-619b3086
diff --git a/data/ok/legislature/Ken-Luttrell-428ba1b3-23b7-433a-8f18-ca53f6eed9aa.yml b/data/ok/legislature/Ken-Luttrell-428ba1b3-23b7-433a-8f18-ca53f6eed9aa.yml
index a0e3583519..63c66d3f77 100644
--- a/data/ok/legislature/Ken-Luttrell-428ba1b3-23b7-433a-8f18-ca53f6eed9aa.yml
+++ b/data/ok/legislature/Ken-Luttrell-428ba1b3-23b7-433a-8f18-ca53f6eed9aa.yml
@@ -2,7 +2,7 @@ id: ocd-person/428ba1b3-23b7-433a-8f18-ca53f6eed9aa
 name: Ken Luttrell
 given_name: Ken
 family_name: Luttrell
-birth_date: '1953-08-13'
+birth_date: 1953-08-13
 gender: Male
 email: ken.luttrell@okhouse.gov
 image: https://www.okhouse.gov/Members/Pictures/HiRes/Luttrell,%20Ken.jpg
diff --git a/data/ok/legislature/Kendal-Sacchieri-8a183515-ff32-4660-8e9c-1317f274a603.yml b/data/ok/legislature/Kendal-Sacchieri-8a183515-ff32-4660-8e9c-1317f274a603.yml
new file mode 100644
index 0000000000..91ebfe0fbc
--- /dev/null
+++ b/data/ok/legislature/Kendal-Sacchieri-8a183515-ff32-4660-8e9c-1317f274a603.yml
@@ -0,0 +1,18 @@
+id: ocd-person/8a183515-ff32-4660-8e9c-1317f274a603
+name: Kendal Sacchieri
+given_name: Kendal
+family_name: Sacchieri
+gender: Female
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/KendalSacchieri2024.jpg
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '43'
+other_names:
+- name: K. Sacchieri
+- name: Sacchieri, K.
+sources:
+- url: https://ballotpedia.org/Kendal_Sacchieri
diff --git a/data/ok/legislature/Lisa-Standridge-6bf75215-5df0-4dfc-adfb-98c60a6871bd.yml b/data/ok/legislature/Lisa-Standridge-6bf75215-5df0-4dfc-adfb-98c60a6871bd.yml
new file mode 100644
index 0000000000..6713c853e2
--- /dev/null
+++ b/data/ok/legislature/Lisa-Standridge-6bf75215-5df0-4dfc-adfb-98c60a6871bd.yml
@@ -0,0 +1,17 @@
+id: ocd-person/6bf75215-5df0-4dfc-adfb-98c60a6871bd
+name: Lisa Standridge
+given_name: Lisa
+family_name: Standridge
+gender: Female
+image: https://www.cairoklahoma.com/wp-content/uploads/2024/08/lisa-474x474.jpeg
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '15'
+other_names:
+- name: L. Standridge
+- name: Standridge, L.
+sources: []
diff --git a/data/ok/legislature/Lonnie-Paxton-fe64cfd8-d85e-472e-8761-27b6a3774971.yml b/data/ok/legislature/Lonnie-Paxton-fe64cfd8-d85e-472e-8761-27b6a3774971.yml
index ffa7833ac6..0cc96b5a1f 100644
--- a/data/ok/legislature/Lonnie-Paxton-fe64cfd8-d85e-472e-8761-27b6a3774971.yml
+++ b/data/ok/legislature/Lonnie-Paxton-fe64cfd8-d85e-472e-8761-27b6a3774971.yml
@@ -2,7 +2,7 @@ id: ocd-person/fe64cfd8-d85e-472e-8761-27b6a3774971
 name: Lonnie Paxton
 given_name: Lonnie
 family_name: Paxton
-birth_date: '1968-08-08'
+birth_date: 1968-08-08
 gender: Male
 email: paxton@oksenate.gov
 image: https://oksenate.gov/sites/default/files/paxton.jpg
diff --git a/data/ok/legislature/Mark-Chapman-a688f8ac-d265-4830-963f-617b726524ed.yml b/data/ok/legislature/Mark-Chapman-a688f8ac-d265-4830-963f-617b726524ed.yml
new file mode 100644
index 0000000000..7371511395
--- /dev/null
+++ b/data/ok/legislature/Mark-Chapman-a688f8ac-d265-4830-963f-617b726524ed.yml
@@ -0,0 +1,21 @@
+id: ocd-person/a688f8ac-d265-4830-963f-617b726524ed
+name: Mark Chapman
+given_name: Mark
+family_name: Chapman
+gender: Male
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/MarkChapman2024.JPG
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '12'
+other_names:
+- name: M. Chapman
+- name: Chapman, M.
+sources:
+- url: https://ballotpedia.org/Mark_Chapman
+- url: https://en.wikipedia.org/wiki/Mark_Chapman_(politician)
+- url: https://justfacts.votesmart.org/candidate/216462/mark-chapman
+- url: https://www.linkedin.com/in/mark-chapman-78b3a330
diff --git a/data/ok/legislature/Mark-Lawson-97351530-ef54-4859-acdd-effcb11eaf1f.yml b/data/ok/legislature/Mark-Lawson-97351530-ef54-4859-acdd-effcb11eaf1f.yml
index b324472c25..f547c6003b 100644
--- a/data/ok/legislature/Mark-Lawson-97351530-ef54-4859-acdd-effcb11eaf1f.yml
+++ b/data/ok/legislature/Mark-Lawson-97351530-ef54-4859-acdd-effcb11eaf1f.yml
@@ -2,7 +2,7 @@ id: ocd-person/97351530-ef54-4859-acdd-effcb11eaf1f
 name: Mark Lawson
 given_name: Mark
 family_name: Lawson
-birth_date: '1980-11-22'
+birth_date: 1980-11-22
 gender: Male
 email: mark.lawson@okhouse.gov
 image: https://www.okhouse.gov/Members/Pictures/HiRes/Lawson,%20Mark.jpg
diff --git a/data/ok/legislature/Mark-Lepak-a1d5d401-d767-4088-b9b6-e03af9d5ed49.yml b/data/ok/legislature/Mark-Lepak-a1d5d401-d767-4088-b9b6-e03af9d5ed49.yml
index f8134a656f..cb38712666 100644
--- a/data/ok/legislature/Mark-Lepak-a1d5d401-d767-4088-b9b6-e03af9d5ed49.yml
+++ b/data/ok/legislature/Mark-Lepak-a1d5d401-d767-4088-b9b6-e03af9d5ed49.yml
@@ -2,7 +2,7 @@ id: ocd-person/a1d5d401-d767-4088-b9b6-e03af9d5ed49
 name: Mark Lepak
 given_name: Mark
 family_name: Lepak
-birth_date: '1956-08-01'
+birth_date: 1956-08-01
 gender: Male
 email: mark.lepak@okhouse.gov
 image: https://www.okhouse.gov/Members/Pictures/HiRes/Lepak,%20Mark.jpg
diff --git a/data/ok/legislature/Mark-Mann-7bf07db8-9661-4f98-859d-9817cb4362dd.yml b/data/ok/legislature/Mark-Mann-7bf07db8-9661-4f98-859d-9817cb4362dd.yml
new file mode 100644
index 0000000000..75655515a3
--- /dev/null
+++ b/data/ok/legislature/Mark-Mann-7bf07db8-9661-4f98-859d-9817cb4362dd.yml
@@ -0,0 +1,21 @@
+id: ocd-person/7bf07db8-9661-4f98-859d-9817cb4362dd
+name: Mark Mann
+given_name: Mark
+family_name: Mann
+birth_date: 1971-12-27
+gender: Male
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/Mark_Mann.png
+party:
+- name: Democratic
+roles:
+- start_date: 2024-11-13
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '46'
+other_names:
+- name: M. Mann
+- name: M.H. Mann
+- name: Mann, M.
+sources:
+- url: https://ballotpedia.org/Mark_Harold_Mann
+- url: https://www.linkedin.com/in/markhmann
diff --git a/data/ok/legislature/Micheal-Bergstrom-49a41053-6a43-44a8-92b9-9fd5e97a56fe.yml b/data/ok/legislature/Micheal-Bergstrom-49a41053-6a43-44a8-92b9-9fd5e97a56fe.yml
index 73b7939713..410d1aba3e 100644
--- a/data/ok/legislature/Micheal-Bergstrom-49a41053-6a43-44a8-92b9-9fd5e97a56fe.yml
+++ b/data/ok/legislature/Micheal-Bergstrom-49a41053-6a43-44a8-92b9-9fd5e97a56fe.yml
@@ -2,7 +2,7 @@ id: ocd-person/49a41053-6a43-44a8-92b9-9fd5e97a56fe
 name: Micheal Bergstrom
 given_name: Micheal
 family_name: Bergstrom
-birth_date: '1958-05-05'
+birth_date: 1958-05-05
 gender: Male
 email: bergstrom@oksenate.gov
 image: https://oksenate.gov/sites/default/files/Bergstrom%2C%20Micheal%202022%20flags.jpg
diff --git a/data/ok/legislature/Michelle-McCane-5822cf27-1b1f-40bd-ace3-a06a7f304820.yml b/data/ok/legislature/Michelle-McCane-5822cf27-1b1f-40bd-ace3-a06a7f304820.yml
new file mode 100644
index 0000000000..cec570ae30
--- /dev/null
+++ b/data/ok/legislature/Michelle-McCane-5822cf27-1b1f-40bd-ace3-a06a7f304820.yml
@@ -0,0 +1,20 @@
+id: ocd-person/5822cf27-1b1f-40bd-ace3-a06a7f304820
+name: Michelle McCane
+given_name: Michelle
+family_name: McCane
+gender: Female
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/MichelleMcCane2024.jpg
+party:
+- name: Democratic
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '72'
+other_names:
+- name: M. McCane
+- name: McCane, M.
+sources:
+- url: https://ballotpedia.org/Michelle_McCane
+- url: https://en.wikipedia.org/wiki/Michelle_McCane
+- url: https://www.linkedin.com/in/m-stevenson
diff --git a/data/ok/legislature/Mike-Kelley-8746752e-619b-454d-9ef6-7f4434acdd71.yml b/data/ok/legislature/Mike-Kelley-8746752e-619b-454d-9ef6-7f4434acdd71.yml
new file mode 100644
index 0000000000..6e2cc1cd98
--- /dev/null
+++ b/data/ok/legislature/Mike-Kelley-8746752e-619b-454d-9ef6-7f4434acdd71.yml
@@ -0,0 +1,21 @@
+id: ocd-person/8746752e-619b-454d-9ef6-7f4434acdd71
+name: Mike Kelley
+given_name: Mike
+family_name: Kelley
+gender: Male
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/MikeKelley2024.jpg
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '60'
+other_names:
+- name: M. Kelley
+- name: M.D. Kelley
+- name: Kelley, M.
+sources:
+- url: https://ballotpedia.org/Mike_Kelley_(Oklahoma)
+- url: https://en.wikipedia.org/wiki/Mike_Kelley_(Oklahoma_politician)
+- url: https://www.linkedin.com/in/mike-kelley-746a1460
diff --git a/data/ok/legislature/Mike-Lay-65f17e9b-aa29-4241-80c8-a800aea8ddae.yml b/data/ok/legislature/Mike-Lay-65f17e9b-aa29-4241-80c8-a800aea8ddae.yml
new file mode 100644
index 0000000000..e8c31e6732
--- /dev/null
+++ b/data/ok/legislature/Mike-Lay-65f17e9b-aa29-4241-80c8-a800aea8ddae.yml
@@ -0,0 +1,21 @@
+id: ocd-person/65f17e9b-aa29-4241-80c8-a800aea8ddae
+name: Mike Lay
+given_name: Mike
+family_name: Lay
+gender: Male
+image: https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcS6rbtW0elpYl-o3FI3jbR9-PkUylFA7p5-Ig&s
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '68'
+other_names:
+- name: M. Lay
+- name: Lay, M.
+sources:
+- url: https://ballotpedia.org/Mike_Lay
+- url: https://en.wikipedia.org/wiki/Mike_Lay
+- url: https://justfacts.votesmart.org/candidate/216521/mike-lay
+- url: https://www.linkedin.com/in/mike-lay-41b57a4a
diff --git a/data/ok/legislature/Molly-Jenkins-82b98199-7b85-488b-b5e8-7f135aad668f.yml b/data/ok/legislature/Molly-Jenkins-82b98199-7b85-488b-b5e8-7f135aad668f.yml
new file mode 100644
index 0000000000..67a2621d67
--- /dev/null
+++ b/data/ok/legislature/Molly-Jenkins-82b98199-7b85-488b-b5e8-7f135aad668f.yml
@@ -0,0 +1,20 @@
+id: ocd-person/82b98199-7b85-488b-b5e8-7f135aad668f
+name: Molly Jenkins
+given_name: Molly
+family_name: Jenkins
+gender: Female
+image: https://www.cushingcitizen.com/sites/cushingcitizen.com/files/styles/article_420/public/3d8c9a84be_Ar00503010.jpg?itok=QUjuCFyZ
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '33'
+other_names:
+- name: M. Jenkins
+- name: M.G. Jenkins
+- name: Jenkins, M.
+sources:
+- url: https://ballotpedia.org/Molly_Jenkins
+- url: https://en.wikipedia.org/wiki/Molly_Jenkins
diff --git a/data/ok/legislature/Nikki-Nice-365647a0-0840-4a40-aac8-697ab21dbcd5.yml b/data/ok/legislature/Nikki-Nice-365647a0-0840-4a40-aac8-697ab21dbcd5.yml
new file mode 100644
index 0000000000..3717c6e9ea
--- /dev/null
+++ b/data/ok/legislature/Nikki-Nice-365647a0-0840-4a40-aac8-697ab21dbcd5.yml
@@ -0,0 +1,22 @@
+id: ocd-person/365647a0-0840-4a40-aac8-697ab21dbcd5
+name: Nikki Nice
+given_name: Nikki
+family_name: Nice
+gender: Female
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/008O6811.jpg
+party:
+- name: Democratic
+roles:
+- start_date: 2024-11-13
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '48'
+other_names:
+- name: N. Nice
+- name: A.N. Nice
+- name: Nice, N.
+sources:
+- url: https://ballotpedia.org/Nikki_Nice
+- url: https://en.wikipedia.org/wiki/Nikki_Nice
+- url: https://justfacts.votesmart.org/candidate/biography/185943/nikki-nice
+- url: https://www.linkedin.com/in/nikki-nice-3062a7b
diff --git a/data/ok/legislature/Paul-Rosino-0388a9a8-8de3-4620-8c44-e887e0f1cecd.yml b/data/ok/legislature/Paul-Rosino-0388a9a8-8de3-4620-8c44-e887e0f1cecd.yml
index 315a08b0a4..8f98cbfd8b 100644
--- a/data/ok/legislature/Paul-Rosino-0388a9a8-8de3-4620-8c44-e887e0f1cecd.yml
+++ b/data/ok/legislature/Paul-Rosino-0388a9a8-8de3-4620-8c44-e887e0f1cecd.yml
@@ -2,7 +2,7 @@ id: ocd-person/0388a9a8-8de3-4620-8c44-e887e0f1cecd
 name: Paul Rosino
 given_name: Paul
 family_name: Rosino
-birth_date: '1962-10-02'
+birth_date: 1962-10-02
 gender: Male
 email: rosino@oksenate.gov
 image: https://oksenate.gov/sites/default/files/Rosino%2C%20Paul%20Flags%202022.jpg
diff --git a/data/ok/legislature/Rande-Worthen-cfa7e540-ce4e-4230-9f82-9784d11733cb.yml b/data/ok/legislature/Rande-Worthen-cfa7e540-ce4e-4230-9f82-9784d11733cb.yml
index 2801198566..9383496e40 100644
--- a/data/ok/legislature/Rande-Worthen-cfa7e540-ce4e-4230-9f82-9784d11733cb.yml
+++ b/data/ok/legislature/Rande-Worthen-cfa7e540-ce4e-4230-9f82-9784d11733cb.yml
@@ -2,7 +2,7 @@ id: ocd-person/cfa7e540-ce4e-4230-9f82-9784d11733cb
 name: Rande Worthen
 given_name: Rande
 family_name: Worthen
-birth_date: '1956-07-16'
+birth_date: 1956-07-16
 gender: Male
 email: rande.worthen@okhouse.gov
 image: https://www.okhouse.gov/Members/Pictures/HiRes/Rande-Worthen.jpg
diff --git a/data/ok/legislature/Randy-Grellner-812abf8c-ed2d-4b91-8d69-0917a39adeed.yml b/data/ok/legislature/Randy-Grellner-812abf8c-ed2d-4b91-8d69-0917a39adeed.yml
new file mode 100644
index 0000000000..b41bb04739
--- /dev/null
+++ b/data/ok/legislature/Randy-Grellner-812abf8c-ed2d-4b91-8d69-0917a39adeed.yml
@@ -0,0 +1,20 @@
+id: ocd-person/812abf8c-ed2d-4b91-8d69-0917a39adeed
+name: Randy Grellner
+given_name: Randy
+family_name: Grellner
+gender: Male
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/RandyGrellner2024.jpg
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '21'
+other_names:
+- name: R. Grellner
+- name: R.J. Grellner
+- name: Grellner, R.
+sources:
+- url: https://ballotpedia.org/Randy_Grellner
+- url: https://en.wikipedia.org/wiki/Randy_Grellner
diff --git a/data/ok/legislature/Regina-Goodwin-2d438999-104f-4405-8cdc-d53ba4715a19.yml b/data/ok/legislature/Regina-Goodwin-2d438999-104f-4405-8cdc-d53ba4715a19.yml
index 8bf2cc66e1..e27927d731 100644
--- a/data/ok/legislature/Regina-Goodwin-2d438999-104f-4405-8cdc-d53ba4715a19.yml
+++ b/data/ok/legislature/Regina-Goodwin-2d438999-104f-4405-8cdc-d53ba4715a19.yml
@@ -2,14 +2,18 @@ id: ocd-person/2d438999-104f-4405-8cdc-d53ba4715a19
 name: Regina Goodwin
 given_name: Regina
 family_name: Goodwin
-birth_date: '1962-09-22'
+birth_date: 1962-09-22
 gender: Female
-email: regina.goodwin@okhouse.gov
 image: https://www.okhouse.gov/Members/Pictures/HiRes/Goodwin,%20Regina.jpg
 party:
 - name: Democratic
 roles:
+- start_date: 2024-11-20
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '11'
 - start_date: 2015-07-21
+  end_date: 2024-11-19
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '73'
diff --git a/data/ok/legislature/Rob-Hall-a73e2372-a002-448b-afbb-31398aed55b1.yml b/data/ok/legislature/Rob-Hall-a73e2372-a002-448b-afbb-31398aed55b1.yml
new file mode 100644
index 0000000000..0c491524b3
--- /dev/null
+++ b/data/ok/legislature/Rob-Hall-a73e2372-a002-448b-afbb-31398aed55b1.yml
@@ -0,0 +1,20 @@
+id: ocd-person/a73e2372-a002-448b-afbb-31398aed55b1
+name: Rob Hall
+given_name: Rob
+family_name: Hall
+gender: Male
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/rhall.jpg
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '67'
+other_names:
+- name: R. Hall
+- name: Hall, R.
+sources:
+- url: https://ballotpedia.org/Rob_Hall
+- url: https://en.wikipedia.org/wiki/Rob_Hall_(politician)
+- url: https://www.linkedin.com/in/rob-hall-39517396
diff --git a/data/ok/legislature/Robert-Manger-a865c489-d177-4058-af64-51c2f0abef68.yml b/data/ok/legislature/Robert-Manger-a865c489-d177-4058-af64-51c2f0abef68.yml
index 1fd38a9d6f..e738895c8f 100644
--- a/data/ok/legislature/Robert-Manger-a865c489-d177-4058-af64-51c2f0abef68.yml
+++ b/data/ok/legislature/Robert-Manger-a865c489-d177-4058-af64-51c2f0abef68.yml
@@ -14,7 +14,7 @@ roles:
   district: '101'
 offices:
 - classification: capitol
-  address: Room 456, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
+  address: Room 464, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
   voice: 405-557-7395
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=101
diff --git a/data/ok/legislature/Ron-Stewart-bdd6a3f7-c76a-459e-aad3-e833a9e110f8.yml b/data/ok/legislature/Ron-Stewart-bdd6a3f7-c76a-459e-aad3-e833a9e110f8.yml
new file mode 100644
index 0000000000..89f3a4de61
--- /dev/null
+++ b/data/ok/legislature/Ron-Stewart-bdd6a3f7-c76a-459e-aad3-e833a9e110f8.yml
@@ -0,0 +1,20 @@
+id: ocd-person/bdd6a3f7-c76a-459e-aad3-e833a9e110f8
+name: Ron Stewart
+given_name: Ron
+family_name: Stewart
+gender: Male
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/RonStewart2024.jpg
+party:
+- name: Democratic
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '73'
+other_names:
+- name: R. Stewart
+- name: Stewart, R.
+sources:
+- url: https://ballotpedia.org/Ron_Stewart
+- url: https://en.wikipedia.org/wiki/Ron_Stewart_(Oklahoma_politician)
+- url: https://www.linkedin.com/in/ronald-stewart-jr-498205142
diff --git a/data/ok/legislature/Ryan-Eaves-f61f3be0-ac28-411d-9641-917af1eb6753.yml b/data/ok/legislature/Ryan-Eaves-f61f3be0-ac28-411d-9641-917af1eb6753.yml
new file mode 100644
index 0000000000..090d0fb97c
--- /dev/null
+++ b/data/ok/legislature/Ryan-Eaves-f61f3be0-ac28-411d-9641-917af1eb6753.yml
@@ -0,0 +1,22 @@
+id: ocd-person/f61f3be0-ac28-411d-9641-917af1eb6753
+name: Ryan Eaves
+given_name: Ryan
+family_name: Eaves
+gender: Male
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/RyanEaves2024.jpg
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '22'
+other_names:
+- name: R. Eaves
+- name: R.D. Eaves
+- name: Eaves, R.
+sources:
+- url: https://ballotpedia.org/Ryan_Eaves
+- url: https://en.wikipedia.org/wiki/Ryan_Eaves
+- url: https://justfacts.votesmart.org/candidate/biography/216475/ryan-eaves
+- url: https://www.linkedin.com/in/ryan-eaves-22a70269
diff --git a/data/ok/legislature/Shane-Jett-97650810-9219-451e-97d1-e3d3318c5d53.yml b/data/ok/legislature/Shane-Jett-97650810-9219-451e-97d1-e3d3318c5d53.yml
index 3be651c329..abcff13b53 100644
--- a/data/ok/legislature/Shane-Jett-97650810-9219-451e-97d1-e3d3318c5d53.yml
+++ b/data/ok/legislature/Shane-Jett-97650810-9219-451e-97d1-e3d3318c5d53.yml
@@ -2,7 +2,7 @@ id: ocd-person/97650810-9219-451e-97d1-e3d3318c5d53
 name: Shane Jett
 given_name: Shane
 family_name: Jett
-birth_date: '1974-12-05'
+birth_date: 1974-12-05
 gender: Male
 email: shane.jett@oksenate.gov
 image: https://oksenate.gov/sites/default/files/Jett%2C%20Shane_flags.jpg
diff --git a/data/ok/legislature/Spencer-Kern-4d4f5043-830c-498d-806c-5b1e9eb183df.yml b/data/ok/legislature/Spencer-Kern-4d4f5043-830c-498d-806c-5b1e9eb183df.yml
new file mode 100644
index 0000000000..daa61ea094
--- /dev/null
+++ b/data/ok/legislature/Spencer-Kern-4d4f5043-830c-498d-806c-5b1e9eb183df.yml
@@ -0,0 +1,22 @@
+id: ocd-person/4d4f5043-830c-498d-806c-5b1e9eb183df
+name: Spencer Kern
+given_name: Spencer
+family_name: Kern
+gender: Male
+image: https://static.votesmart.org/static/canphoto/216441.jpg
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '31'
+other_names:
+- name: S. Kern
+- name: S.M. Kern
+- name: Kern, S.
+sources:
+- url: https://ballotpedia.org/Spencer_Kern
+- url: https://en.wikipedia.org/wiki/Spencer_Kern
+- url: https://justfacts.votesmart.org/candidate/biography/216441/spencer-kern
+- url: https://www.linkedin.com/in/spencer-kern-1451a137
diff --git a/data/ok/legislature/Stacy-Adams-d93d9d8d-1299-423a-bb9e-ade2bcb0fa11.yml b/data/ok/legislature/Stacy-Adams-d93d9d8d-1299-423a-bb9e-ade2bcb0fa11.yml
new file mode 100644
index 0000000000..267a1805dc
--- /dev/null
+++ b/data/ok/legislature/Stacy-Adams-d93d9d8d-1299-423a-bb9e-ade2bcb0fa11.yml
@@ -0,0 +1,21 @@
+id: ocd-person/d93d9d8d-1299-423a-bb9e-ade2bcb0fa11
+name: Stacy Adams
+given_name: Stacy
+family_name: Adams
+gender: Female
+image: https://s3.amazonaws.com/ballotpedia-api4/files/thumbs/200/300/StacyAdams2024.png
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '50'
+other_names:
+- name: S. Adams
+- name: S.J. Adams
+- name: Adams, S.
+sources:
+- url: https://ballotpedia.org/Stacy_Adams
+- url: https://justfacts.votesmart.org/candidate/biography/216494/stacy-adams
+- url: https://www.linkedin.com/in/stacy-adams-73b68b194
diff --git a/data/ok/legislature/Steve-Bashore-bf810dce-34f8-4db5-b242-efc008311228.yml b/data/ok/legislature/Steve-Bashore-bf810dce-34f8-4db5-b242-efc008311228.yml
index e8c6fd65ac..3fe3f33a19 100644
--- a/data/ok/legislature/Steve-Bashore-bf810dce-34f8-4db5-b242-efc008311228.yml
+++ b/data/ok/legislature/Steve-Bashore-bf810dce-34f8-4db5-b242-efc008311228.yml
@@ -14,7 +14,7 @@ roles:
   district: '7'
 offices:
 - classification: capitol
-  address: Room 248, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
+  address: Room 456, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
   voice: 405-557-7399
 links:
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=7
diff --git a/data/ok/legislature/Tim-Turner-d3bf80d0-be37-4e25-b7c6-7e30e54fe158.yml b/data/ok/legislature/Tim-Turner-d3bf80d0-be37-4e25-b7c6-7e30e54fe158.yml
new file mode 100644
index 0000000000..2c7b84cde7
--- /dev/null
+++ b/data/ok/legislature/Tim-Turner-d3bf80d0-be37-4e25-b7c6-7e30e54fe158.yml
@@ -0,0 +1,20 @@
+id: ocd-person/d3bf80d0-be37-4e25-b7c6-7e30e54fe158
+name: Tim Turner
+given_name: Tim
+family_name: Turner
+gender: Male
+image: https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSdKW8Yps28Qqd_HZ-KGr8HDljGbqjeswJrSA&s
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-20
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:ok/government
+  district: '15'
+other_names:
+- name: T. Turner
+- name: T.W. Turner
+- name: Turner, T.
+sources:
+- url: https://ballotpedia.org/Tim_Turner_(Oklahoma)
+- url: https://en.wikipedia.org/wiki/Tim_Turner_(politician)
diff --git a/data/ok/legislature/Trish-Ranson-d3a66cdd-0469-4c20-90da-620f60c4b4be.yml b/data/ok/legislature/Trish-Ranson-d3a66cdd-0469-4c20-90da-620f60c4b4be.yml
index b3dcae9166..6423065c18 100644
--- a/data/ok/legislature/Trish-Ranson-d3a66cdd-0469-4c20-90da-620f60c4b4be.yml
+++ b/data/ok/legislature/Trish-Ranson-d3a66cdd-0469-4c20-90da-620f60c4b4be.yml
@@ -2,7 +2,7 @@ id: ocd-person/d3a66cdd-0469-4c20-90da-620f60c4b4be
 name: Trish Ranson
 given_name: Trish
 family_name: Ranson
-birth_date: '1969-11-23'
+birth_date: 1969-11-23
 gender: Female
 email: trish.ranson@okhouse.gov
 image: https://www.okhouse.gov/Members/Pictures/HiRes/Ranson,%20Trish.jpg
diff --git a/data/ok/legislature/Blake-Stephens-1e7de93b-e5e5-4c8c-8835-950bfa33f3b8.yml b/data/ok/retired/Blake-Stephens-1e7de93b-e5e5-4c8c-8835-950bfa33f3b8.yml
similarity index 87%
rename from data/ok/legislature/Blake-Stephens-1e7de93b-e5e5-4c8c-8835-950bfa33f3b8.yml
rename to data/ok/retired/Blake-Stephens-1e7de93b-e5e5-4c8c-8835-950bfa33f3b8.yml
index 5893385ff1..084126d9f5 100644
--- a/data/ok/legislature/Blake-Stephens-1e7de93b-e5e5-4c8c-8835-950bfa33f3b8.yml
+++ b/data/ok/retired/Blake-Stephens-1e7de93b-e5e5-4c8c-8835-950bfa33f3b8.yml
@@ -12,10 +12,8 @@ roles:
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '3'
-offices:
-- classification: capitol
-  address: Room 528.2, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-521-5574
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://oksenate.gov/contact-senator?sid=1521372
   note: Contact Form
diff --git a/data/ok/legislature/Charles-McCall-b28a6474-e6ec-4d2c-be07-b39ca4900b5c.yml b/data/ok/retired/Charles-McCall-b28a6474-e6ec-4d2c-be07-b39ca4900b5c.yml
similarity index 91%
rename from data/ok/legislature/Charles-McCall-b28a6474-e6ec-4d2c-be07-b39ca4900b5c.yml
rename to data/ok/retired/Charles-McCall-b28a6474-e6ec-4d2c-be07-b39ca4900b5c.yml
index d66a02f070..02134290f2 100644
--- a/data/ok/legislature/Charles-McCall-b28a6474-e6ec-4d2c-be07-b39ca4900b5c.yml
+++ b/data/ok/retired/Charles-McCall-b28a6474-e6ec-4d2c-be07-b39ca4900b5c.yml
@@ -13,10 +13,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '22'
-offices:
-- classification: capitol
-  address: Room 401, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7412
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=22
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=22
diff --git a/data/ok/legislature/Chris-Kidd-f4a27c36-bfc5-4e2c-8ea4-233e924b6d77.yml b/data/ok/retired/Chris-Kidd-f4a27c36-bfc5-4e2c-8ea4-233e924b6d77.yml
similarity index 90%
rename from data/ok/legislature/Chris-Kidd-f4a27c36-bfc5-4e2c-8ea4-233e924b6d77.yml
rename to data/ok/retired/Chris-Kidd-f4a27c36-bfc5-4e2c-8ea4-233e924b6d77.yml
index 2857de0e81..8ca5c24d93 100644
--- a/data/ok/legislature/Chris-Kidd-f4a27c36-bfc5-4e2c-8ea4-233e924b6d77.yml
+++ b/data/ok/retired/Chris-Kidd-f4a27c36-bfc5-4e2c-8ea4-233e924b6d77.yml
@@ -13,10 +13,8 @@ roles:
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '31'
-offices:
-- classification: capitol
-  address: Room 420, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-521-5563
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://oksenate.gov/Senators/biographies/kidd_bio.aspx
 - url: https://oksenate.gov/contact-senator?sid=1856
diff --git a/data/ok/legislature/Cody-Rogers-ee540967-ff83-42c4-af73-e6704d91a285.yml b/data/ok/retired/Cody-Rogers-ee540967-ff83-42c4-af73-e6704d91a285.yml
similarity index 87%
rename from data/ok/legislature/Cody-Rogers-ee540967-ff83-42c4-af73-e6704d91a285.yml
rename to data/ok/retired/Cody-Rogers-ee540967-ff83-42c4-af73-e6704d91a285.yml
index eb7e77d9b6..98f9700b67 100644
--- a/data/ok/legislature/Cody-Rogers-ee540967-ff83-42c4-af73-e6704d91a285.yml
+++ b/data/ok/retired/Cody-Rogers-ee540967-ff83-42c4-af73-e6704d91a285.yml
@@ -12,10 +12,8 @@ roles:
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '37'
-offices:
-- classification: capitol
-  address: Room 430, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-521-5600
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://oksenate.gov/contact-senator?sid=1521377
   note: Contact Form
diff --git a/data/ok/legislature/Dean-Davis-5df27b4e-c704-4bbf-a775-a879e3a27e2b.yml b/data/ok/retired/Dean-Davis-5df27b4e-c704-4bbf-a775-a879e3a27e2b.yml
similarity index 88%
rename from data/ok/legislature/Dean-Davis-5df27b4e-c704-4bbf-a775-a879e3a27e2b.yml
rename to data/ok/retired/Dean-Davis-5df27b4e-c704-4bbf-a775-a879e3a27e2b.yml
index 57523b0eab..2b2bee5ae9 100644
--- a/data/ok/legislature/Dean-Davis-5df27b4e-c704-4bbf-a775-a879e3a27e2b.yml
+++ b/data/ok/retired/Dean-Davis-5df27b4e-c704-4bbf-a775-a879e3a27e2b.yml
@@ -12,10 +12,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '98'
-offices:
-- classification: capitol
-  address: Room 500, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7362
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=98
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=98
diff --git a/data/ok/legislature/Dewayne-Pemberton-6f40934a-8f91-49c3-89a7-f4c4875617b1.yml b/data/ok/retired/Dewayne-Pemberton-6f40934a-8f91-49c3-89a7-f4c4875617b1.yml
similarity index 90%
rename from data/ok/legislature/Dewayne-Pemberton-6f40934a-8f91-49c3-89a7-f4c4875617b1.yml
rename to data/ok/retired/Dewayne-Pemberton-6f40934a-8f91-49c3-89a7-f4c4875617b1.yml
index 40a00590d0..0768640ede 100644
--- a/data/ok/legislature/Dewayne-Pemberton-6f40934a-8f91-49c3-89a7-f4c4875617b1.yml
+++ b/data/ok/retired/Dewayne-Pemberton-6f40934a-8f91-49c3-89a7-f4c4875617b1.yml
@@ -13,10 +13,8 @@ roles:
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '9'
-offices:
-- classification: capitol
-  address: Room 429, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-521-5533
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://oksenate.gov/Senators/biographies/pemberton_bio.aspx
 - url: https://oksenate.gov/contact-senator?sid=1886
diff --git a/data/ok/legislature/George-Young-fd37f2df-5e46-464d-800c-28f96162bda0.yml b/data/ok/retired/George-Young-fd37f2df-5e46-464d-800c-28f96162bda0.yml
similarity index 91%
rename from data/ok/legislature/George-Young-fd37f2df-5e46-464d-800c-28f96162bda0.yml
rename to data/ok/retired/George-Young-fd37f2df-5e46-464d-800c-28f96162bda0.yml
index 5b5779e2e5..1b6ed0362d 100644
--- a/data/ok/legislature/George-Young-fd37f2df-5e46-464d-800c-28f96162bda0.yml
+++ b/data/ok/retired/George-Young-fd37f2df-5e46-464d-800c-28f96162bda0.yml
@@ -12,14 +12,12 @@ roles:
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '48'
+  end_date: 2024-11-19
 - end_date: 2018-11-15
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '99'
-offices:
-- classification: capitol
-  address: Room 524, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-521-5531
+offices: []
 links:
 - url: https://oksenate.gov/Senators/biographies/young_bio.aspx
 - url: https://oksenate.gov/contact-senator?sid=1864
diff --git a/data/ok/legislature/Greg-McCortney-31d076dc-036f-47cf-9fa1-5be461aed33d.yml b/data/ok/retired/Greg-McCortney-31d076dc-036f-47cf-9fa1-5be461aed33d.yml
similarity index 86%
rename from data/ok/legislature/Greg-McCortney-31d076dc-036f-47cf-9fa1-5be461aed33d.yml
rename to data/ok/retired/Greg-McCortney-31d076dc-036f-47cf-9fa1-5be461aed33d.yml
index 2e47e8fa7b..ac62f4e5f1 100644
--- a/data/ok/legislature/Greg-McCortney-31d076dc-036f-47cf-9fa1-5be461aed33d.yml
+++ b/data/ok/retired/Greg-McCortney-31d076dc-036f-47cf-9fa1-5be461aed33d.yml
@@ -13,12 +13,8 @@ roles:
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '13'
-offices:
-- classification: capitol
-  address: Room 421, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-521-5541
-- classification: district
-  address: 117 S. Broadway, Ada, OK 74820
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://oksenate.gov/Senators/biographies/mccortney_bio.aspx
 - url: https://oksenate.gov/contact-senator?sid=1860
diff --git a/data/ok/legislature/Greg-Treat-45cbdac2-6de7-4ed0-ac46-076fa79e631b.yml b/data/ok/retired/Greg-Treat-45cbdac2-6de7-4ed0-ac46-076fa79e631b.yml
similarity index 89%
rename from data/ok/legislature/Greg-Treat-45cbdac2-6de7-4ed0-ac46-076fa79e631b.yml
rename to data/ok/retired/Greg-Treat-45cbdac2-6de7-4ed0-ac46-076fa79e631b.yml
index a5c70f4261..f3ae034b7f 100644
--- a/data/ok/legislature/Greg-Treat-45cbdac2-6de7-4ed0-ac46-076fa79e631b.yml
+++ b/data/ok/retired/Greg-Treat-45cbdac2-6de7-4ed0-ac46-076fa79e631b.yml
@@ -13,10 +13,8 @@ roles:
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '47'
-offices:
-- classification: capitol
-  address: Room 422, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-521-5632
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://oksenate.gov/Senators/biographies/treat_bio.aspx
 - url: https://oksenate.gov/contact-senator?sid=1835
diff --git a/data/ok/legislature/Jeff-Boatman-82451cbe-531b-42f4-a9bd-41e469aa5a2a.yml b/data/ok/retired/Jeff-Boatman-82451cbe-531b-42f4-a9bd-41e469aa5a2a.yml
similarity index 88%
rename from data/ok/legislature/Jeff-Boatman-82451cbe-531b-42f4-a9bd-41e469aa5a2a.yml
rename to data/ok/retired/Jeff-Boatman-82451cbe-531b-42f4-a9bd-41e469aa5a2a.yml
index 8113a89cb2..e00b15a53a 100644
--- a/data/ok/legislature/Jeff-Boatman-82451cbe-531b-42f4-a9bd-41e469aa5a2a.yml
+++ b/data/ok/retired/Jeff-Boatman-82451cbe-531b-42f4-a9bd-41e469aa5a2a.yml
@@ -12,10 +12,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '67'
-offices:
-- classification: capitol
-  address: Room 336, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7341
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=67
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=67
diff --git a/data/ok/legislature/Jessica-Garvin-3258a3c4-6d4a-410c-ae77-67f20af6f600.yml b/data/ok/retired/Jessica-Garvin-3258a3c4-6d4a-410c-ae77-67f20af6f600.yml
similarity index 86%
rename from data/ok/legislature/Jessica-Garvin-3258a3c4-6d4a-410c-ae77-67f20af6f600.yml
rename to data/ok/retired/Jessica-Garvin-3258a3c4-6d4a-410c-ae77-67f20af6f600.yml
index a7585c9f74..a28aa472e2 100644
--- a/data/ok/legislature/Jessica-Garvin-3258a3c4-6d4a-410c-ae77-67f20af6f600.yml
+++ b/data/ok/retired/Jessica-Garvin-3258a3c4-6d4a-410c-ae77-67f20af6f600.yml
@@ -12,10 +12,8 @@ roles:
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '43'
-offices:
-- classification: capitol
-  address: Room 237, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-521-5522
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://oksenate.gov/contact-senator?sid=1521378
   note: Contact Form
diff --git a/data/ok/legislature/Joe-Newhouse-fbdd88d6-2125-4a58-8474-8804127576f3.yml b/data/ok/retired/Joe-Newhouse-fbdd88d6-2125-4a58-8474-8804127576f3.yml
similarity index 84%
rename from data/ok/legislature/Joe-Newhouse-fbdd88d6-2125-4a58-8474-8804127576f3.yml
rename to data/ok/retired/Joe-Newhouse-fbdd88d6-2125-4a58-8474-8804127576f3.yml
index 304f7004c3..115952317a 100644
--- a/data/ok/legislature/Joe-Newhouse-fbdd88d6-2125-4a58-8474-8804127576f3.yml
+++ b/data/ok/retired/Joe-Newhouse-fbdd88d6-2125-4a58-8474-8804127576f3.yml
@@ -13,12 +13,8 @@ roles:
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '25'
-offices:
-- classification: capitol
-  address: Room 534, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-521-5675
-- classification: district
-  address: 10026-A S. Mingo Road Suite 163, Tulsa, OK 74133
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://oksenate.gov/Senators/biographies/newhouse_bio.aspx
 - url: https://oksenate.gov/contact-senator?sid=1863
diff --git a/data/ok/legislature/John-Talley-97d8456c-f3d3-46c9-82dd-50a5ffc64fe1.yml b/data/ok/retired/John-Talley-97d8456c-f3d3-46c9-82dd-50a5ffc64fe1.yml
similarity index 88%
rename from data/ok/legislature/John-Talley-97d8456c-f3d3-46c9-82dd-50a5ffc64fe1.yml
rename to data/ok/retired/John-Talley-97d8456c-f3d3-46c9-82dd-50a5ffc64fe1.yml
index d3820df200..ce68845416 100644
--- a/data/ok/legislature/John-Talley-97d8456c-f3d3-46c9-82dd-50a5ffc64fe1.yml
+++ b/data/ok/retired/John-Talley-97d8456c-f3d3-46c9-82dd-50a5ffc64fe1.yml
@@ -12,10 +12,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '33'
-offices:
-- classification: capitol
-  address: Room 330, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7304
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=33
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=33
diff --git a/data/ok/legislature/Jon-Echols-e3430b28-db75-4427-a9b3-9fe5e535e672.yml b/data/ok/retired/Jon-Echols-e3430b28-db75-4427-a9b3-9fe5e535e672.yml
similarity index 89%
rename from data/ok/legislature/Jon-Echols-e3430b28-db75-4427-a9b3-9fe5e535e672.yml
rename to data/ok/retired/Jon-Echols-e3430b28-db75-4427-a9b3-9fe5e535e672.yml
index a295e5ccdd..35ce08278f 100644
--- a/data/ok/legislature/Jon-Echols-e3430b28-db75-4427-a9b3-9fe5e535e672.yml
+++ b/data/ok/retired/Jon-Echols-e3430b28-db75-4427-a9b3-9fe5e535e672.yml
@@ -13,10 +13,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '90'
-offices:
-- classification: capitol
-  address: Room 457, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7354
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=90
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=90
diff --git a/data/ok/legislature/Kay-Floyd-c98205ed-1cb0-4dac-8acb-0102a61ee8a4.yml b/data/ok/retired/Kay-Floyd-c98205ed-1cb0-4dac-8acb-0102a61ee8a4.yml
similarity index 89%
rename from data/ok/legislature/Kay-Floyd-c98205ed-1cb0-4dac-8acb-0102a61ee8a4.yml
rename to data/ok/retired/Kay-Floyd-c98205ed-1cb0-4dac-8acb-0102a61ee8a4.yml
index 39fe51ff21..0dbfc230ed 100644
--- a/data/ok/legislature/Kay-Floyd-c98205ed-1cb0-4dac-8acb-0102a61ee8a4.yml
+++ b/data/ok/retired/Kay-Floyd-c98205ed-1cb0-4dac-8acb-0102a61ee8a4.yml
@@ -12,10 +12,8 @@ roles:
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '46'
-offices:
-- classification: capitol
-  address: Room 517, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-521-5610
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://oksenate.gov/Senators/biographies/floyd_bio.aspx
 - url: https://oksenate.gov/contact-senator?sid=1849
diff --git a/data/ok/legislature/Kevin-Matthews-934d09a3-b098-4209-aa68-c986efeba65c.yml b/data/ok/retired/Kevin-Matthews-934d09a3-b098-4209-aa68-c986efeba65c.yml
similarity index 90%
rename from data/ok/legislature/Kevin-Matthews-934d09a3-b098-4209-aa68-c986efeba65c.yml
rename to data/ok/retired/Kevin-Matthews-934d09a3-b098-4209-aa68-c986efeba65c.yml
index de06b13d37..2ec9a77eff 100644
--- a/data/ok/legislature/Kevin-Matthews-934d09a3-b098-4209-aa68-c986efeba65c.yml
+++ b/data/ok/retired/Kevin-Matthews-934d09a3-b098-4209-aa68-c986efeba65c.yml
@@ -13,10 +13,8 @@ roles:
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '11'
-offices:
-- classification: capitol
-  address: Room 516, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-521-5598
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://oksenate.gov/Senators/biographies/matthews_bio.aspx
 - url: https://oksenate.gov/contact-senator?sid=1859
diff --git a/data/ok/legislature/Kevin-McDugle-887d29f4-0c91-4bdf-89ce-57a5de014ff6.yml b/data/ok/retired/Kevin-McDugle-887d29f4-0c91-4bdf-89ce-57a5de014ff6.yml
similarity index 90%
rename from data/ok/legislature/Kevin-McDugle-887d29f4-0c91-4bdf-89ce-57a5de014ff6.yml
rename to data/ok/retired/Kevin-McDugle-887d29f4-0c91-4bdf-89ce-57a5de014ff6.yml
index ce68c03f26..4babea797d 100644
--- a/data/ok/legislature/Kevin-McDugle-887d29f4-0c91-4bdf-89ce-57a5de014ff6.yml
+++ b/data/ok/retired/Kevin-McDugle-887d29f4-0c91-4bdf-89ce-57a5de014ff6.yml
@@ -12,10 +12,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '12'
-offices:
-- classification: capitol
-  address: Room 242, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7388
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=12
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=12
diff --git a/data/ok/legislature/Kevin-Wallace-dd9558e2-76ad-4955-a4d0-9363a7bcbbec.yml b/data/ok/retired/Kevin-Wallace-dd9558e2-76ad-4955-a4d0-9363a7bcbbec.yml
similarity index 89%
rename from data/ok/legislature/Kevin-Wallace-dd9558e2-76ad-4955-a4d0-9363a7bcbbec.yml
rename to data/ok/retired/Kevin-Wallace-dd9558e2-76ad-4955-a4d0-9363a7bcbbec.yml
index ca4221cefb..a9f08961b7 100644
--- a/data/ok/legislature/Kevin-Wallace-dd9558e2-76ad-4955-a4d0-9363a7bcbbec.yml
+++ b/data/ok/retired/Kevin-Wallace-dd9558e2-76ad-4955-a4d0-9363a7bcbbec.yml
@@ -12,10 +12,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '32'
-offices:
-- classification: capitol
-  address: Room 200, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7368
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=32
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=32
diff --git a/data/ok/legislature/Lonnie-Sims-4c1db434-3489-4363-aec6-3519affd6b84.yml b/data/ok/retired/Lonnie-Sims-4c1db434-3489-4363-aec6-3519affd6b84.yml
similarity index 89%
rename from data/ok/legislature/Lonnie-Sims-4c1db434-3489-4363-aec6-3519affd6b84.yml
rename to data/ok/retired/Lonnie-Sims-4c1db434-3489-4363-aec6-3519affd6b84.yml
index 5e6eedd715..f9e8c1f46e 100644
--- a/data/ok/legislature/Lonnie-Sims-4c1db434-3489-4363-aec6-3519affd6b84.yml
+++ b/data/ok/retired/Lonnie-Sims-4c1db434-3489-4363-aec6-3519affd6b84.yml
@@ -12,10 +12,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '68'
-offices:
-- classification: capitol
-  address: Room 248, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7340
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=68
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=68
diff --git a/data/ok/legislature/Marcus-McEntire-6fad0759-b23e-4fa9-9aab-7c20eb0b2479.yml b/data/ok/retired/Marcus-McEntire-6fad0759-b23e-4fa9-9aab-7c20eb0b2479.yml
similarity index 89%
rename from data/ok/legislature/Marcus-McEntire-6fad0759-b23e-4fa9-9aab-7c20eb0b2479.yml
rename to data/ok/retired/Marcus-McEntire-6fad0759-b23e-4fa9-9aab-7c20eb0b2479.yml
index ecc540f410..3c13b661cc 100644
--- a/data/ok/legislature/Marcus-McEntire-6fad0759-b23e-4fa9-9aab-7c20eb0b2479.yml
+++ b/data/ok/retired/Marcus-McEntire-6fad0759-b23e-4fa9-9aab-7c20eb0b2479.yml
@@ -12,10 +12,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '50'
-offices:
-- classification: capitol
-  address: Room 204, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7327
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=50
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=50
diff --git a/data/ok/legislature/Mark-McBride-9c6a6826-6d39-4bb1-9c69-c9bed446b800.yml b/data/ok/retired/Mark-McBride-9c6a6826-6d39-4bb1-9c69-c9bed446b800.yml
similarity index 90%
rename from data/ok/legislature/Mark-McBride-9c6a6826-6d39-4bb1-9c69-c9bed446b800.yml
rename to data/ok/retired/Mark-McBride-9c6a6826-6d39-4bb1-9c69-c9bed446b800.yml
index dc27f9e25e..894fd0e718 100644
--- a/data/ok/legislature/Mark-McBride-9c6a6826-6d39-4bb1-9c69-c9bed446b800.yml
+++ b/data/ok/retired/Mark-McBride-9c6a6826-6d39-4bb1-9c69-c9bed446b800.yml
@@ -13,10 +13,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '53'
-offices:
-- classification: capitol
-  address: Room 452, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7346
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=53
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=53
diff --git a/data/ok/legislature/Mauree-Turner-6533ee8e-f664-4339-b7ef-4be64c0f56e4.yml b/data/ok/retired/Mauree-Turner-6533ee8e-f664-4339-b7ef-4be64c0f56e4.yml
similarity index 86%
rename from data/ok/legislature/Mauree-Turner-6533ee8e-f664-4339-b7ef-4be64c0f56e4.yml
rename to data/ok/retired/Mauree-Turner-6533ee8e-f664-4339-b7ef-4be64c0f56e4.yml
index 62589e46a0..c84a92de79 100644
--- a/data/ok/legislature/Mauree-Turner-6533ee8e-f664-4339-b7ef-4be64c0f56e4.yml
+++ b/data/ok/retired/Mauree-Turner-6533ee8e-f664-4339-b7ef-4be64c0f56e4.yml
@@ -12,10 +12,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '88'
-offices:
-- classification: capitol
-  address: Room 601, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7396
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=88
   note: Contact Form
diff --git a/data/ok/legislature/Monroe-Nichols-8c8adabd-e844-42d2-a3a9-85b5f38619c2.yml b/data/ok/retired/Monroe-Nichols-8c8adabd-e844-42d2-a3a9-85b5f38619c2.yml
similarity index 90%
rename from data/ok/legislature/Monroe-Nichols-8c8adabd-e844-42d2-a3a9-85b5f38619c2.yml
rename to data/ok/retired/Monroe-Nichols-8c8adabd-e844-42d2-a3a9-85b5f38619c2.yml
index 2efebfd233..2873758d31 100644
--- a/data/ok/legislature/Monroe-Nichols-8c8adabd-e844-42d2-a3a9-85b5f38619c2.yml
+++ b/data/ok/retired/Monroe-Nichols-8c8adabd-e844-42d2-a3a9-85b5f38619c2.yml
@@ -13,10 +13,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '72'
-offices:
-- classification: capitol
-  address: Room 502, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7391
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=72
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=72
diff --git a/data/ok/legislature/Nathan-Dahm-a6ab9bdd-5ddd-41e1-b9b2-0ff5a5da9747.yml b/data/ok/retired/Nathan-Dahm-a6ab9bdd-5ddd-41e1-b9b2-0ff5a5da9747.yml
similarity index 90%
rename from data/ok/legislature/Nathan-Dahm-a6ab9bdd-5ddd-41e1-b9b2-0ff5a5da9747.yml
rename to data/ok/retired/Nathan-Dahm-a6ab9bdd-5ddd-41e1-b9b2-0ff5a5da9747.yml
index 3e560c10b7..d46cd684d8 100644
--- a/data/ok/legislature/Nathan-Dahm-a6ab9bdd-5ddd-41e1-b9b2-0ff5a5da9747.yml
+++ b/data/ok/retired/Nathan-Dahm-a6ab9bdd-5ddd-41e1-b9b2-0ff5a5da9747.yml
@@ -12,10 +12,8 @@ roles:
 - type: upper
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '33'
-offices:
-- classification: capitol
-  address: Room 526, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-521-5551
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://oksenate.gov/Senators/biographies/dahm_bio.aspx
 - url: https://oksenate.gov/contact-senator?sid=1845
diff --git a/data/ok/legislature/Randy-Randleman-3625e2bf-2150-4ec6-b58c-2a90522d0bd6.yml b/data/ok/retired/Randy-Randleman-3625e2bf-2150-4ec6-b58c-2a90522d0bd6.yml
similarity index 89%
rename from data/ok/legislature/Randy-Randleman-3625e2bf-2150-4ec6-b58c-2a90522d0bd6.yml
rename to data/ok/retired/Randy-Randleman-3625e2bf-2150-4ec6-b58c-2a90522d0bd6.yml
index 50c7b27604..3d397b3ec9 100644
--- a/data/ok/legislature/Randy-Randleman-3625e2bf-2150-4ec6-b58c-2a90522d0bd6.yml
+++ b/data/ok/retired/Randy-Randleman-3625e2bf-2150-4ec6-b58c-2a90522d0bd6.yml
@@ -12,10 +12,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '15'
-offices:
-- classification: capitol
-  address: Room 405, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7375
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=15
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=15
diff --git a/data/ok/legislature/Rhonda-Baker-bc0edc8a-d7b4-4f90-a4c3-75e3fd83e80b.yml b/data/ok/retired/Rhonda-Baker-bc0edc8a-d7b4-4f90-a4c3-75e3fd83e80b.yml
similarity index 89%
rename from data/ok/legislature/Rhonda-Baker-bc0edc8a-d7b4-4f90-a4c3-75e3fd83e80b.yml
rename to data/ok/retired/Rhonda-Baker-bc0edc8a-d7b4-4f90-a4c3-75e3fd83e80b.yml
index e8c05f097f..9bb96d262d 100644
--- a/data/ok/legislature/Rhonda-Baker-bc0edc8a-d7b4-4f90-a4c3-75e3fd83e80b.yml
+++ b/data/ok/retired/Rhonda-Baker-bc0edc8a-d7b4-4f90-a4c3-75e3fd83e80b.yml
@@ -12,10 +12,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '60'
-offices:
-- classification: capitol
-  address: Room 464, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7311
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=60
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=60
diff --git a/data/ok/legislature/Rob-Standridge-1985c048-831a-4634-9a7a-b626ad9fc1b4.yml b/data/ok/retired/Rob-Standridge-1985c048-831a-4634-9a7a-b626ad9fc1b4.yml
similarity index 90%
rename from data/ok/legislature/Rob-Standridge-1985c048-831a-4634-9a7a-b626ad9fc1b4.yml
rename to data/ok/retired/Rob-Standridge-1985c048-831a-4634-9a7a-b626ad9fc1b4.yml
index 3822fd7dfd..e2034e27ed 100644
--- a/data/ok/legislature/Rob-Standridge-1985c048-831a-4634-9a7a-b626ad9fc1b4.yml
+++ b/data/ok/retired/Rob-Standridge-1985c048-831a-4634-9a7a-b626ad9fc1b4.yml
@@ -12,10 +12,8 @@ roles:
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '15'
-offices:
-- classification: capitol
-  address: Room 418, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-521-5535
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://oksenate.gov/Senators/biographies/standridge_bio.aspx
 - url: https://oksenate.gov/contact-senator?sid=1889
diff --git a/data/ok/legislature/Roger-Thompson-6a9315ca-2e99-4473-a18a-7e1fab3b6462.yml b/data/ok/retired/Roger-Thompson-6a9315ca-2e99-4473-a18a-7e1fab3b6462.yml
similarity index 91%
rename from data/ok/legislature/Roger-Thompson-6a9315ca-2e99-4473-a18a-7e1fab3b6462.yml
rename to data/ok/retired/Roger-Thompson-6a9315ca-2e99-4473-a18a-7e1fab3b6462.yml
index 01f867a4c0..14779349ae 100644
--- a/data/ok/legislature/Roger-Thompson-6a9315ca-2e99-4473-a18a-7e1fab3b6462.yml
+++ b/data/ok/retired/Roger-Thompson-6a9315ca-2e99-4473-a18a-7e1fab3b6462.yml
@@ -12,10 +12,8 @@ roles:
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '8'
-offices:
-- classification: capitol
-  address: Room 238, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-521-5588
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://oksenate.gov/Senators/biographies/thompson_bio.aspx
 - url: https://oksenate.gov/contact-senator?sid=1885
diff --git a/data/ok/legislature/Sherrie-Conley-0ce16141-28f9-424f-9747-ca2cb23bf53c.yml b/data/ok/retired/Sherrie-Conley-0ce16141-28f9-424f-9747-ca2cb23bf53c.yml
similarity index 89%
rename from data/ok/legislature/Sherrie-Conley-0ce16141-28f9-424f-9747-ca2cb23bf53c.yml
rename to data/ok/retired/Sherrie-Conley-0ce16141-28f9-424f-9747-ca2cb23bf53c.yml
index baa5fa377f..6561bf39d1 100644
--- a/data/ok/legislature/Sherrie-Conley-0ce16141-28f9-424f-9747-ca2cb23bf53c.yml
+++ b/data/ok/retired/Sherrie-Conley-0ce16141-28f9-424f-9747-ca2cb23bf53c.yml
@@ -12,10 +12,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '20'
-offices:
-- classification: capitol
-  address: Room 340, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7308
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=20
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=20
diff --git a/data/ok/legislature/Terry-ODonnell-5e39c9cf-fb99-4f15-9e19-faf114214f29.yml b/data/ok/retired/Terry-ODonnell-5e39c9cf-fb99-4f15-9e19-faf114214f29.yml
similarity index 90%
rename from data/ok/legislature/Terry-ODonnell-5e39c9cf-fb99-4f15-9e19-faf114214f29.yml
rename to data/ok/retired/Terry-ODonnell-5e39c9cf-fb99-4f15-9e19-faf114214f29.yml
index a943d29a77..4117972100 100644
--- a/data/ok/legislature/Terry-ODonnell-5e39c9cf-fb99-4f15-9e19-faf114214f29.yml
+++ b/data/ok/retired/Terry-ODonnell-5e39c9cf-fb99-4f15-9e19-faf114214f29.yml
@@ -13,10 +13,8 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '23'
-offices:
-- classification: capitol
-  address: Room 305, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-557-7379
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://www.okhouse.gov/Members/District.aspx?District=23
 - url: https://www.okhouse.gov/Members/Contact.aspx?District=23
diff --git a/data/ok/legislature/Tom-Dugger-3025d79b-f373-43d0-ab05-97a6384f0098.yml b/data/ok/retired/Tom-Dugger-3025d79b-f373-43d0-ab05-97a6384f0098.yml
similarity index 90%
rename from data/ok/legislature/Tom-Dugger-3025d79b-f373-43d0-ab05-97a6384f0098.yml
rename to data/ok/retired/Tom-Dugger-3025d79b-f373-43d0-ab05-97a6384f0098.yml
index ed761d66c3..3f70deb127 100644
--- a/data/ok/legislature/Tom-Dugger-3025d79b-f373-43d0-ab05-97a6384f0098.yml
+++ b/data/ok/retired/Tom-Dugger-3025d79b-f373-43d0-ab05-97a6384f0098.yml
@@ -13,10 +13,8 @@ roles:
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/state:ok/government
   district: '21'
-offices:
-- classification: capitol
-  address: Room 530, 2300 N. Lincoln Blvd., Oklahoma City, OK 73105
-  voice: 405-521-5572
+  end_date: 2024-11-19
+offices: []
 links:
 - url: https://oksenate.gov/Senators/biographies/dugger_bio.aspx
 - url: https://oksenate.gov/contact-senator?sid=1848
diff --git a/settings.yml b/settings.yml
index 2738292177..93bf28fa4d 100644
--- a/settings.yml
+++ b/settings.yml
@@ -129,6 +129,11 @@ ny:
   - chamber: lower
     district: 96
     vacant_until: 2025-01-01
+ok:
+  vacancies:
+  - chamber: upper
+    district: '8'
+    vacant_until: 2025-01-01
 ri:
   vacancies:
   - chamber: upper