Yeap, not really dead ... I'm now working on this and I forgot to drop from this commit :p

I'll move to the correct wone ;)