diff --git a/tasks/checks.yml b/tasks/checks.yml
index adc0bac6375513bdda0b03553113468ee5b74d05..c9016366f1f78af22a61b047c5b6d2c717f5250b 100644
--- a/tasks/checks.yml
+++ b/tasks/checks.yml
@@ -148,52 +148,17 @@
 
       when: ( php_versions_absent is defined ) and ( php_versions_absent != [] )
 
-    # - name: Debug fail
-    #   fail:
-
-    # - name: Include version checks
-    #   include_tasks: version_checks.yml
-    #   loop: "{{ php_versions | dict2items }}"
-    #   loop_control:
-    #     loop_var: proposed_version
-    #     label: "{{ proposed_version.key }}"
-
-    # - name: Set an array for the PHP packages with version numbers in their names
-    #   set_fact:
-    #     php_version_packages: "{{ php_version_packages | default([]) }} + [ 'php{{ php_version }}-{{ php_package }}' ]"
-    #   loop: "{{ php_versioned_packages }}"
-    #   loop_control:
-    #     loop_var: php_package
-    #     label: "{{ php_package }}"
-
-    # - name: Check and enable the www pool
-    #   block:
-
-    #     - name: Include www pool server variable checks
-    #       include_tasks: pool_check.yml
-    #       when: php_www_pool_pm == "dynamic"
-    #       vars:
-    #         php_pm: "{{ php_www_pool_pm }}"
-    #         php_pm_max_children: "{{ php_www_pool_pm_max_children }}"
-    #         php_pm_start_servers: "{{ php_www_pool_pm_start_servers }}"
-    #         php_pm_min_spare_servers: "{{ php_www_pool_pm_min_spare_servers }}"
-    #         php_pm_max_spare_servers: "{{ php_www_pool_pm_max_spare_servers }}"
-
+    # - name: Include www pool server variable checks
+    #   include_tasks: pool_check.yml
+    #   when: php_www_pool_pm == "dynamic"
+    #   vars:
+    #     php_pm: "{{ php_www_pool_pm }}"
+    #     php_pm_max_children: "{{ php_www_pool_pm_max_children }}"
+    #     php_pm_start_servers: "{{ php_www_pool_pm_start_servers }}"
+    #     php_pm_min_spare_servers: "{{ php_www_pool_pm_min_spare_servers }}"
+    #     php_pm_max_spare_servers: "{{ php_www_pool_pm_max_spare_servers }}"
     #   when: ( php_www_pool_enabled is not defined ) or ( php_www_pool_enabled is defined and php_www_pool_enabled )
 
-    # - name: Check the PHP-FPM configuration
-    #   command: "php-fpm{{ php_version }} --test"
-    #   check_mode: false
-    #   changed_when: false
-    #   register: php_test
-    #   failed_when: ( "test is successful" not in php_test.stderr )
-    #   notify: Restart php-fpm
-
-    # - name: Check that /usr/bin/crontab exists
-    #   stat:
-    #     path: /usr/bin/crontab
-    #   register: php_crontab
-
   tags:
     - php
 ...
diff --git a/tasks/main.yml b/tasks/main.yml
index 4003fb9827b4390b4f0f501b5b6d7ef9d9903d30..f282a86a7ebbe4aec595f5e0d568d785745e7f8c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -66,6 +66,19 @@
         state: present
         update_cache: true
 
+    # TODO
+    # 
+    # Remove directories for SAPIs that have state absent
+    #
+    # Check the ansible_local.phpquery modules against the php_versions modules_enabled and modules disabled
+    # and enable / disable modules as required
+    #
+    # Write php.ini files
+    #
+    # Use update-alternatives to set the default version
+    #
+    # Disable the www pool for all versions but the default PHP version
+
     - name: Debug fail
       fail: