Finisehd Set-up

There, I think I'm right in saying I've got the basics in place so that
I can start actually working on things tomorrow.