Nearly done

I'm not using that code any more