Thanks for all the help, I learnt some valuable tricks there. Hopefully this thread will be useful for others wanting to take the upgrade too.
Matthew