Done, you can rebase against devel to get the new script