@@ -18,10 +18,6 @@
 sys.path.insert(0, os.path.abspath('../../..'))
 sys.path.insert(0, os.path.abspath('../../../mdf_forge'))
 sys.path.insert(0, os.path.abspath('../../../tests'))
-import recommonmark
-from recommonmark.parser import CommonMarkParser
-from recommonmark.transform import AutoStructify
-
 
 # -- Project information -----------------------------------------------------
 
@@ -49,7 +45,6 @@
     'sphinx.ext.intersphinx',
     'sphinx.ext.ifconfig',
     'sphinx.ext.napoleon',
-    'nbsphinx',
     'sphinx.ext.mathjax',
     'IPython.sphinxext.ipython_console_highlighting',
 ]
@@ -67,9 +62,12 @@
 
 
 # Use Markdown and reStructuredText in the same Sphinx project.
-source_parsers = {
-    '.md': CommonMarkParser,
-}
+# from recommonmark.parser import CommonMarkParser
+
+# source_parsers = {
+#    '.md': CommonMarkParser,
+# }
+
 source_suffix = ['.rst', '.md']
 
 # The master toctree document.
@@ -225,14 +223,4 @@
 # Example configuration for inter sphinx: refer to the Python standard library.
 #intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
 
-# app setup hook
-github_doc_root = 'https://github.com/rtfd/recommonmark/tree/master/doc/'
-def setup(app):
-    app.add_config_value('recommonmark_config', {
-        'url_resolver': lambda url: github_doc_root + url,
-        'auto_toc_tree_section': 'Contents',
-        'enable_eval_rst': True,
-        'enable_auto_doc_ref': True,
-    }, True)
-    app.add_transform(AutoStructify)
 
@@ -25,7 +25,7 @@ Installation
     installation_guide.rst
 
 For Developers
-~~~~~~~~~~~~~~
+--------------
 
 .. image:: https://img.shields.io/pypi/v/mdf_forge.svg
    :target: https://pypi.python.org/pypi/mdf-forge
@@ -52,6 +52,24 @@ Documentation and examples
 Documentation, including tutorials and examples, can be found in the
 ``docs`` directory.
 
+Tutorials
+---------
+
+#. Introduction (`Jupyter Notebook <https://github.com/materials-data-facility/forge/blob/master/docs/examples/Introduction.ipynb/>`_)
+#. Core Query Builder Functions (`Jupyter Notebook <https://github.com/materials-data-facility/forge/blob/master/docs/examples/Core%20Query%20Builder%20Functions.ipynb/>`_)
+#. Expanded Query Builder Functions (`Jupyter Notebook <https://github.com/materials-data-facility/forge/blob/master/docs/examples/Expanded%20Query%20Builder%20Functions.ipynb/>`_)
+#. General Helper Functions (`Jupyter Notebook <https://github.com/materials-data-facility/forge/blob/master/docs/examples/General%20Helper%20Functions.ipynb/>`_)
+#. Field-Specific Helper Functions (`Jupyter Notebook <https://github.com/materials-data-facility/forge/blob/master/docs/examples/Field-Specific%20Helper%20Functions.ipynb/>`_)
+#. Data Retrieval Functions (`Jupyter Notebook <https://github.com/materials-data-facility/forge/blob/master/docs/examples/Data%20Retrieval%20Functions.ipynb/>`_)
+
+Examples
+--------
+
+#. Example Aggregations (`Jupyter Notebook <https://github.com/materials-data-facility/forge/blob/master/docs/examples/Example%20Aggregations.ipynb/>`_)
+#. Example Analysis - Fe-Cr-Al Oxidation (`Jupyter Notebook <https://github.com/materials-data-facility/forge/blob/master/docs/examples/Example%20Analysis%20-%20Fe-Cr-Al%20Oxidation.ipynb/>`_)
+#. Example Machine Learning - OQMD (`Jupyter Notebook <https://github.com/materials-data-facility/forge/blob/master/docs/examples/Example%20Machine%20Learning%20-%20OQMD.ipynb/>`_)
+#. Example Statistics - MDF Datasets (`Jupyter Notebook <https://github.com/materials-data-facility/forge/blob/master/docs/examples/Example%20Statistics%20-%20MDF%20Datasets.ipynb/>`_)
+
 Requirements
 ============
 
 
@@ -7,24 +7,16 @@ forge.module.forge
    :show-inheritance:
 
 forge.class.Forge
-^^^^^^^^^^^^^^^^^
+-----------------
 ..  autoclass:: forge.Forge
     :members:
 
 forge.class.Query
-^^^^^^^^^^^^^^^^^
+-----------------
 
 ..  autoclass:: forge.Query
     :members:
 
-forge.module.test_forge
------------------------
-
-.. automodule:: test_forge
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 ----
 
 :doc:`MDF Forge Home <index>`
@@ -1,6 +1,4 @@
 Sphinx build and requirements
 -----------------------------
 
-* sphinx
-* commonmark==0.5.5
-* recommonmark
+* sphinx