OK. Drafted that already, will have it on the next commit.