Indeed, and that'll be next on my hit list. Should be able to share a fair amount of code between them I think.