diff --git a/conjugation/drill.html b/conjugation/drill.html
index 66d205b..b538a13 100755
--- a/conjugation/drill.html
+++ b/conjugation/drill.html
@@ -35,6 +35,7 @@
           <li><label><input type="checkbox" id="past" checked> Past</label></li>
           <li><label><input type="checkbox" id="te-form"> て form</label></li>
           <li><label><input type="checkbox" id="progressive"> Progressive</label></li>
+          <li><label><input type="checkbox" id="desire"> Desire</label></li>
           <li><label><input type="checkbox" id="potential"> Potential</label></li>
           <li><label><input type="checkbox" id="imperative"> Imperative</label></li>
           <li><label><input type="checkbox" id="passive"> Passive</label></li>
diff --git a/conjugation/drill.js b/conjugation/drill.js
index 5e01034..58b5d4c 100755
--- a/conjugation/drill.js
+++ b/conjugation/drill.js
@@ -106,6 +106,23 @@ var transformations = [
   { from: "progressive past negative", to: "polite progressive past negative" },
   { from: "polite progressive past", to: "polite progressive past negative" },
   { from: "polite progressive negative", to: "polite progressive past negative" },
+  { from: "dictionary", to: "desire" },
+  { from: "polite", to: "desire polite" },
+  { from: "negative", to: "desire negative" },
+  { from: "polite negative", to: "desire polite negative" },
+  { from: "desire", to: "dictionary" },
+  { from: "desire polite", to: "polite" },
+  { from: "desire negative", to: "negative" },
+  { from: "desire polite negative", to: "polite negative" },
+  { from: "desire", to: "desire polite" },
+  { from: "desire", to: "desire negative" },
+  { from: "desire polite", to: "desire" },
+  { from: "desire polite", to: "desire polite negative" },
+  { from: "desire negative", to: "desire" },
+  { from: "desire negative", to: "desire polite negative" },
+  { from: "desire polite negative", to: "desire polite" },
+  { from: "desire polite negative", to: "desire negative" },
+
 ];
 
 var log;
@@ -680,6 +697,7 @@ function calculateTransitions() {
       "causative": "non-causative",
       "passive": "active",
       "progressive": "non-progressive",
+      "desire": "&apos;non-desire&apos;",
     };
 
     var to_extra = {
@@ -692,6 +710,7 @@ function calculateTransitions() {
       "causative": "causative",
       "passive": "passive",
       "progressive": "progressive",
+      "desire": "&apos;desire&apos;",
     };
 
     var phrase;
@@ -756,7 +775,7 @@ function getOptions() {
   var options = ["plain", "polite", "negative", "past", "te-form",
     "progressive", "potential", "imperative", "passive", "causative",
     "godan", "ichidan", "iku", "kuru", "suru", "i-adjective", "na-adjective",
-    "ii", "trick", "kana"];
+    "ii", "desire", "trick", "kana"];
 
   var result = {};
 
diff --git a/conjugation/rules.js b/conjugation/rules.js
index 277f7d6..cf8ea85 100644
--- a/conjugation/rules.js
+++ b/conjugation/rules.js
@@ -443,6 +443,54 @@ var rules = {
       { "before": "ぶ", "after": "んでいませんでした" },
       { "before": "む", "after": "んでいませんでした" },
     ],
+
+    "desire" : [
+      { "before": "る", "after": "りたい" },
+      { "before": "つ", "after": "ちたい" },
+      { "before": "う", "after": "いたい" },
+      { "before": "く", "after": "きたい" },
+      { "before": "ぐ", "after": "ぎたい" },
+      { "before": "す", "after": "したい" },
+      { "before": "ぬ", "after": "にたい" },
+      { "before": "ぶ", "after": "びたい" },
+      { "before": "む", "after": "みたい" },
+    ],
+
+    "desire negative" : [
+      { "before": "る", "after": "りたくない" },
+      { "before": "つ", "after": "ちたくない" },
+      { "before": "う", "after": "いたくない" },
+      { "before": "く", "after": "きたくない" },
+      { "before": "ぐ", "after": "ぎたくない" },
+      { "before": "す", "after": "したくない" },
+      { "before": "ぬ", "after": "にたくない" },
+      { "before": "ぶ", "after": "びたくない" },
+      { "before": "む", "after": "みたくない" },
+    ],
+
+    "desire polite" : [
+      { "before": "る", "after": "りたいです" },
+      { "before": "つ", "after": "ちたいです" },
+      { "before": "う", "after": "いたいです" },
+      { "before": "く", "after": "きたいです" },
+      { "before": "ぐ", "after": "ぎたいです" },
+      { "before": "す", "after": "したいです" },
+      { "before": "ぬ", "after": "にたいです" },
+      { "before": "ぶ", "after": "びたいです" },
+      { "before": "む", "after": "みたいです" },
+    ],
+
+    "desire polite negative" : [
+      { "before": "る", "after": "りたくないです" },
+      { "before": "つ", "after": "ちたくないです" },
+      { "before": "う", "after": "いたくないです" },
+      { "before": "く", "after": "きたくないです" },
+      { "before": "ぐ", "after": "ぎたくないです" },
+      { "before": "す", "after": "したくないです" },
+      { "before": "ぬ", "after": "にたくないです" },
+      { "before": "ぶ", "after": "びたくないです" },
+      { "before": "む", "after": "みたくないです" },
+    ],
   },
 
   "ichidan" : {
@@ -478,6 +526,10 @@ var rules = {
     "progressive past negative": [ { "before": "る", "after": "ていなかった" } ],
     "polite progressive past": [ { "before": "る", "after": "ていました" } ],
     "polite progressive past negative": [ { "before": "る", "after": "ていませんでした" } ],
+    "desire" : [ { "before": "る", "after": "たい" }, ],
+    "desire negative" : [ { "before": "る", "after": "たくない" }, ],
+    "desire polite" : [ { "before": "る", "after": "たいです" }, ],
+    "desire polite negative" : [ { "before": "る", "after": "たくないです" }, ],
   },
 
   "iku" : {
@@ -512,6 +564,10 @@ var rules = {
     "progressive past negative": [ { "result": "行[い]っていなかった" } ],
     "polite progressive past": [ { "result": "行[い]っていました" } ],
     "polite progressive past negative": [ { "result": "行[い]っていませんでした" } ],
+    "desire" : [ { "result": "行[い]きたい" }, ],
+    "desire negative" : [ { "result": "行[い]きたくない" }, ],
+    "desire polite" : [ { "result": "行[い]きたいです" }, ],
+    "desire polite negative" : [ { "result": "行[い]きたくないです" }, ],
   },
 
   "kuru" : {
@@ -542,6 +598,10 @@ var rules = {
     "progressive past negative": [ { "result": "来[き]ていなかった" } ],
     "polite progressive past": [ { "result": "来[き]ていました" } ],
     "polite progressive past negative": [ { "result": "来[き]ていませんでした" } ],
+    "desire" : [ { "result": "来[き]たい" }, ],
+    "desire negative" : [ { "result": "来[き]たくない" }, ],
+    "desire polite" : [ { "result": "来[き]たいです" }, ],
+    "desire polite negative" : [ { "result": "来[き]たくないです" }, ],
   },
 
   "suru" : {
@@ -564,6 +624,10 @@ var rules = {
     "progressive past negative": [ { "before": "する", "after": "していなかった" } ],
     "polite progressive past": [ { "before": "する", "after": "していました" } ],
     "polite progressive past negative": [ { "before": "する", "after": "していませんでした" } ],
+    "desire" : [ { "before": "する", "after": "したい" }, ],
+    "desire negative" : [ { "before": "する", "after": "したくない" }, ],
+    "desire polite" : [ { "before": "する", "after": "したいです" }, ],
+    "desire polite negative" : [ { "before": "する", "after": "したくないです" }, ],
   },
 
   "i-adjective" : {