About time this got checked into source control somewhere...