Commit for testing

I believe that I've just sorted out my issues. Committing so Dar can
take a look at what I'm up to.