Switching around the doco a bit. Things are broken right now.

TODO: Use the new Python enums?