fix #4, I now have a working copy. All code that I need is transfered.