Removed some stuff the user is supposed to implement
Merge branch 'complete'
Removed a whole bunch of code
Last minute edits
More complete documentation.
Revert "Removed a whole bunch of code"

This reverts commit 84219d906b7599a3648d933d62a349e6cee112d4.