Think I have finished... now to test on virgin system.