There. Done for now. Just have to wait and see what @theoneeyedowl thinks of it...