Thanks for the comments, lads.
Doc, I've edited the 1st post with a pic of the insides. It's not the neatest of jobs, but it works fine. No matter how good my intentions are when I start a stick I can just never seem to keep the innards tidy. I need more practice, I think.