diff --git a/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs.sparql
deleted file mode 100644
index 933685fc2..000000000
--- a/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs.sparql
+++ /dev/null
@@ -1,31 +0,0 @@
-# tool: scribe-data
-# All Estonian (Q9072) verbs and the currently implemented tenses for each.
-# Enter this query at https://query.wikidata.org/
-
-SELECT
-  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?verb
-
-WHERE {
-  ?lexeme dct:language wd:Q9072 ;
-    wikibase:lexicalCategory wd:Q24905 ;
-    wikibase:lemma ?verb .
-
-  # MARK: Supine
-
-  # MARK: Present
-
-  # MARK: Present Conditional
-
-  # MARK: Present Quotative
-
-  # MARK: Present Imperative
-
-  # MARK: Past
-
-  # MARK: Past Imperfect
-
-  # MARK: Past Conditional
-
-  #MARK: Past Quotative
-}
diff --git a/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs_1.sparql b/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs_1.sparql
new file mode 100644
index 000000000..48c39fa06
--- /dev/null
+++ b/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs_1.sparql
@@ -0,0 +1,57 @@
+# tool: scribe-data
+# All Estonian verbs and their present and past indicative forms.
+# Enter this query at https://query.wikidata.org/
+
+SELECT
+  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
+  ?verb
+  ?presentIndicativeSingular
+  ?presentIndicativePlural
+  ?pastIndicativeSingular
+  ?pastIndicativePlural
+
+WHERE {
+  ?lexeme dct:language wd:Q9072 ;
+    wikibase:lexicalCategory wd:Q24905 ;
+    wikibase:lemma ?verb .
+
+  # MARK: Present Indicative Singular
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?presentIndicativeSingularForm .
+    ?presentIndicativeSingularForm ontolex:representation ?presentIndicativeSingular ;
+      wikibase:grammaticalFeature wd:Q192613 ;
+      wikibase:grammaticalFeature wd:Q682111 ;
+      wikibase:grammaticalFeature wd:Q110786 .
+  }
+
+  # MARK: Present Indicative Plural
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?presentIndicativePluralForm .
+    ?presentIndicativePluralForm ontolex:representation ?presentIndicativePlural ;
+      wikibase:grammaticalFeature wd:Q192613 ;
+      wikibase:grammaticalFeature wd:Q682111 ;
+      wikibase:grammaticalFeature wd:Q146786 .
+  }
+
+  # MARK: Past Indicative Singular
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?pastIndicativeSingularForm .
+    ?pastIndicativeSingularForm ontolex:representation ?pastIndicativeSingular ;
+      wikibase:grammaticalFeature wd:Q1994301 ;
+      wikibase:grammaticalFeature wd:Q682111 ;
+      wikibase:grammaticalFeature wd:Q110786 .
+  }
+
+  # MARK: Past Indicative Plural
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?pastIndicativePluralForm .
+    ?pastIndicativePluralForm ontolex:representation ?pastIndicativePlural ;
+      wikibase:grammaticalFeature wd:Q1994301 ;
+      wikibase:grammaticalFeature wd:Q682111 ;
+      wikibase:grammaticalFeature wd:Q146786 .
+  }
+}
diff --git a/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs_2.sparql b/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs_2.sparql
new file mode 100644
index 000000000..f64639346
--- /dev/null
+++ b/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs_2.sparql
@@ -0,0 +1,57 @@
+# tool: scribe-data
+# All Estonian verbs and their present and past conditional forms.
+# Enter this query at https://query.wikidata.org/
+
+SELECT
+  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
+  ?verb
+  ?presentConditionalSingular
+  ?presentConditionalPlural
+  ?pastConditionalSingular
+  ?pastConditionalPlural
+
+WHERE {
+  ?lexeme dct:language wd:Q9072 ;
+    wikibase:lexicalCategory wd:Q24905 ;
+    wikibase:lemma ?verb .
+
+  # MARK: Present Conditional Singular
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?presentConditionalSingularForm .
+    ?presentConditionalSingularForm ontolex:representation ?presentConditionalSingular ;
+      wikibase:grammaticalFeature wd:Q192613 ;
+      wikibase:grammaticalFeature wd:Q625581 ;
+      wikibase:grammaticalFeature wd:Q110786 .
+  }
+
+  # MARK: Present Conditional Plural
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?presentConditionalPluralForm .
+    ?presentConditionalPluralForm ontolex:representation ?presentConditionalPlural ;
+      wikibase:grammaticalFeature wd:Q192613 ;
+      wikibase:grammaticalFeature wd:Q625581 ;
+      wikibase:grammaticalFeature wd:Q146786 .
+  }
+
+  # MARK: Past Conditional Singular
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?pastConditionalSingularForm .
+    ?pastConditionalSingularForm ontolex:representation ?pastConditionalSingular ;
+      wikibase:grammaticalFeature wd:Q1994301 ;
+      wikibase:grammaticalFeature wd:Q625581 ;
+      wikibase:grammaticalFeature wd:Q110786 .
+  }
+
+  # MARK: Past Conditional Plural
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?pastConditionalPluralForm .
+    ?pastConditionalPluralForm ontolex:representation ?pastConditionalPlural ;
+      wikibase:grammaticalFeature wd:Q1994301 ;
+      wikibase:grammaticalFeature wd:Q625581 ;
+      wikibase:grammaticalFeature wd:Q146786 .
+  }
+}
diff --git a/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs_3.sparql b/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs_3.sparql
new file mode 100644
index 000000000..a54d60f38
--- /dev/null
+++ b/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs_3.sparql
@@ -0,0 +1,79 @@
+# tool: scribe-data
+# All Estonian verbs and their imperative and negated forms.
+# Enter this query at https://query.wikidata.org/
+
+SELECT
+  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
+  ?verb
+  ?imperativeSPS
+  ?imperativeFPP
+  ?imperativeSPP
+  ?imperativeImpersonal
+  ?negativePresent
+  ?negativePast
+
+WHERE {
+  ?lexeme dct:language wd:Q9072 ;
+    wikibase:lexicalCategory wd:Q24905 ;
+    wikibase:lemma ?verb .
+
+  # MARK: Imperative Second Person Singular
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?imperativeSPSForm .
+    ?imperativeSPSForm ontolex:representation ?imperativeSPS ;
+      wikibase:grammaticalFeature wd:Q22716 ;
+      wikibase:grammaticalFeature wd:Q51929049 ;
+      wikibase:grammaticalFeature wd:Q110786 ;
+      wikibase:grammaticalFeature wd:Q192613 .
+  }
+
+  # MARK: Imperative First Person Plural
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?imperativeFPPForm .
+    ?imperativeFPPForm ontolex:representation ?imperativeFPP ;
+      wikibase:grammaticalFeature wd:Q22716 ;
+      wikibase:grammaticalFeature wd:Q21714344 ;
+      wikibase:grammaticalFeature wd:Q146786 ;
+      wikibase:grammaticalFeature wd:Q192613 .
+  }
+
+  # MARK: Imperative Second Person Plural
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?imperativeSPPForm .
+    ?imperativeSPPForm ontolex:representation ?imperativeSPP ;
+      wikibase:grammaticalFeature wd:Q22716 ;
+      wikibase:grammaticalFeature wd:Q51929049 ;
+      wikibase:grammaticalFeature wd:Q146786 ;
+      wikibase:grammaticalFeature wd:Q192613 .
+  }
+
+  # MARK: Imperative Impersonal
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?imperativeImpersonalForm .
+    ?imperativeImpersonalForm ontolex:representation ?imperativeImpersonal ;
+      wikibase:grammaticalFeature wd:Q22716 ;
+      wikibase:grammaticalFeature wd:Q1509829 .
+  }
+
+  # MARK: Negative Present
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?negativePresentForm .
+    ?negativePresentForm ontolex:representation ?negativePresent ;
+      wikibase:grammaticalFeature wd:Q1478451 ;
+      wikibase:grammaticalFeature wd:Q192613 .
+  }
+
+  # MARK: Negative Past
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?negativePastForm .
+    ?negativePastForm ontolex:representation ?negativePast ;
+      wikibase:grammaticalFeature wd:Q1478451 ;
+      wikibase:grammaticalFeature wd:Q1994301 .
+  }
+}
diff --git a/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs_4.sparql b/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs_4.sparql
new file mode 100644
index 000000000..522d2fe3b
--- /dev/null
+++ b/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs_4.sparql
@@ -0,0 +1,32 @@
+# tool: scribe-data
+# All Estonian verbs and their participles (present and past).
+# Enter this query at https://query.wikidata.org/
+
+SELECT
+  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
+  ?verb
+  ?presentParticiple
+  ?pastParticiple
+
+WHERE {
+  ?lexeme dct:language wd:Q9072 ;
+    wikibase:lexicalCategory wd:Q24905 ;
+    wikibase:lemma ?verb .
+
+  # MARK: Present Participle
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?presentParticipleForm .
+    ?presentParticipleForm ontolex:representation ?presentParticiple ;
+      wikibase:grammaticalFeature wd:Q10345583 .
+  }
+
+  # MARK: Past Participle
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?pastParticipleForm .
+    ?pastParticipleForm ontolex:representation ?pastParticiple ;
+      wikibase:grammaticalFeature wd:Q1994301 ;
+      wikibase:grammaticalFeature wd:Q10345583 .
+  }
+}
diff --git a/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs_5.sparql b/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs_5.sparql
new file mode 100644
index 000000000..46983ad7b
--- /dev/null
+++ b/src/scribe_data/language_data_extraction/Estonian/verbs/query_verbs_5.sparql
@@ -0,0 +1,49 @@
+# tool: scribe-data
+# All Estonian verbs and their non-finite forms (Des-form, Supine, Infinitive).
+# Enter this query at https://query.wikidata.org/
+
+SELECT
+  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
+  ?verb
+  ?des
+  ?supine
+  ?quotative
+  ?impersonal
+
+WHERE {
+  ?lexeme dct:language wd:Q9072 ;
+    wikibase:lexicalCategory wd:Q24905 ;
+    wikibase:lemma ?verb .
+
+  # MARK: Des
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?desForm .
+    ?desForm ontolex:representation ?des ;
+      wikibase:grammaticalFeature wd:Q12360803 .
+  }
+
+  # MARK: Supine
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?supineForm .
+    ?supineForm ontolex:representation ?supine ;
+      wikibase:grammaticalFeature wd:Q548470 .
+  }
+
+  # MARK: Quotative
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?quotativeForm .
+    ?quotativeForm ontolex:representation ?quotative ;
+      wikibase:grammaticalFeature wd:Q7272884 .
+  }
+
+  # MARK: Impersonal
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?impersonalForm .
+    ?impersonalForm ontolex:representation ?impersonal ;
+      wikibase:grammaticalFeature wd:Q1509829 .
+  }
+}