Great, let me know when that's finished and I'll merge..;)