diff --git a/TODO b/TODO
deleted file mode 100644
index fc43d8c..0000000
--- a/TODO
+++ /dev/null
@@ -1,24 +0,0 @@
-
-Status of the implementation of the RunDeck API version 1
-http://rundeck.org/1.2.1/RunDeck-Guide.html#rundeck-api
-
-1. System Info - OK
-2. Listing Jobs - OK
-3. Running a Job - OK
-4. Exporting Jobs - OK (XML only, YAML not supported yet)
-5. Importing Jobs - TODO
-6. Getting a Job Definition - OK (XML only, YAML not supported yet)
-7. Deleting a Job Definition - OK
-8. Getting Executions for a Job - OK
-9. Listing Running Executions - OK
-10. Getting Execution Info - OK
-11. Aborting Executions - OK
-12. Running Adhoc Commands - OK
-13. Running Adhoc Scripts - TODO
-14. Listing Projects - OK
-15. Getting Project Info - OK
-16. Listing History - TODO
-17. Creating History Event Reports - TODO
-18. Listing Resources - OK (XML only, YAML not supported yet)
-19. Getting Resource Info - OK (XML only, YAML not supported yet)
-
diff --git a/src/site/confluence/status.confluence b/src/site/confluence/status.confluence
new file mode 100644
index 0000000..2964b31
--- /dev/null
+++ b/src/site/confluence/status.confluence
@@ -0,0 +1,27 @@
+
+h1. Status of the implementation of the RunDeck API
+
+h2. RunDeck API version 1
+
+[Documentation of the RunDeck API version 1|http://rundeck.org/1.2.1/RunDeck-Guide.html#rundeck-api]
+
+* System Info - OK
+* Listing Jobs - OK
+* Running a Job - OK
+* Exporting Jobs - OK (XML only, YAML not supported yet)
+* Importing Jobs - *TODO*
+* Getting a Job Definition - OK (XML only, YAML not supported yet)
+* Deleting a Job Definition - OK
+* Getting Executions for a Job - OK
+* Listing Running Executions - OK
+* Getting Execution Info - OK
+* Aborting Executions - OK
+* Running Adhoc Commands - OK
+* Running Adhoc Scripts - *TODO*
+* Listing Projects - OK
+* Getting Project Info - OK
+* Listing History - *TODO*
+* Creating History Event Reports - *TODO*
+* Listing Resources - OK (XML only, YAML not supported yet)
+* Getting Resource Info - OK (XML only, YAML not supported yet)
+
diff --git a/src/site/site.xml b/src/site/site.xml
index 33ed17a..35210c5 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -24,12 +24,13 @@