Putting things together

I really don't enjoy erasing history, but this particular project
has a good number of commits that I'm not particularly proud of,
and also referenced some things that on reflection, aren't
suitable for a public forum.