Wildman's first pull request

So I think I've made some progress here...