Fixed name to work with test script.

I fixed the file name on yours so it will run properly on the test server.

Your script fails when I try to run it. It seems to contain too many nested loops.

I made a few more adjustments and added some TODO's