New content.

Also fix indentation and a bunch of other stuff. More to come
(probably.)