diff --git a/docs/contents.rst.inc b/docs/contents.rst.inc
index f6d63b3..7007666 100644
--- a/docs/contents.rst.inc
+++ b/docs/contents.rst.inc
@@ -10,9 +10,13 @@ instructions for web development with Flask.
 
    foreword
    installation
+   which-python
+   dev-env
    useful-tools
    tutorial/index
    project-structure
+   documentation
+   testing
    packaging
    templating
    testing
diff --git a/docs/dev-env.rst b/docs/dev-env.rst
new file mode 100644
index 0000000..cbddc52
--- /dev/null
+++ b/docs/dev-env.rst
@@ -0,0 +1,53 @@
+Your Development Environment
+============================
+
+Testing your code is very important.
+
+
+Editors
+:::::::
+
+
+Text Editors
+-------------
+
+
+
+IDEs
+----
+
+
+
+Interpreter Tools
+:::::::::::::::::
+
+
+virtualenv
+----------
+
+
+virtualenvwrapper
+-----------------
+
+
+
+Other Tools
+:::::::::::
+
+IPython
+-------
+
+::
+
+    $ pip install ipython
+
+
+
+BPython
+-------
+
+::
+
+    $ pip install bpython
+
+
diff --git a/docs/documentation.rst b/docs/documentation.rst
new file mode 100644
index 0000000..be18124
--- /dev/null
+++ b/docs/documentation.rst
@@ -0,0 +1,20 @@
+Documenting Your Code
+=====================
+
+Documenting your code is extremely important. It is debatebly even
+more important than testing.
+
+
+The Basics
+::::::::::
+
+
+Code Comments
+-------------
+
+
+
+Doc Strings
+-----------
+
+
diff --git a/docs/testing.rst b/docs/testing.rst
new file mode 100644
index 0000000..247c3ca
--- /dev/null
+++ b/docs/testing.rst
@@ -0,0 +1,31 @@
+Testing Your Code
+=====================
+
+Testing your code is very important.
+
+
+The Basics
+::::::::::
+
+
+Code Comments
+-------------
+
+
+
+Doc Strings
+-----------
+
+
+Tools
+:::::
+
+
+Unittest2
+---------
+
+
+tox
+---
+
+
diff --git a/docs/useful-tools.rst b/docs/useful-tools.rst
deleted file mode 100644
index 01b236d..0000000
--- a/docs/useful-tools.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-Useful Tools
-============
-
-IPython
--------
-
-::
-
-    $ pip install ipython
-
-
-
-BPython
--------
-
-::
-
-    $ pip install bpython
diff --git a/docs/which-python.rst b/docs/which-python.rst
new file mode 100644
index 0000000..f94f4f2
--- /dev/null
+++ b/docs/which-python.rst
@@ -0,0 +1,25 @@
+Picking an Interpreter
+======================
+
+Which Python to use?
+
+
+2.x vs 3.x
+::::::::::
+
+
+
+History
+-------
+
+
+
+Today
+-----
+
+Use 2.7.
+
+
+
+Which Python to Support?
+::::::::::::::::::::::::