Initial commit

Tidy up.