Good luck!

And although it all seems like a ball ache to do as Paul has suggested, in the long run it'll make life soooo much easier.