First commit of my tidying-the-place-up project.

Hopefully this all makes sense!