New doctests for documentation. Boilerplate and example one. Reordering of things everywhere.