yay.. another lot of refactoring.. should have logged all details..