Euh, well, ... this will be an extra branch that is temporary stashed :D