This is  still a bit working in progress, if you want move to contrib. Not include in a distribution release.