Added a new class, kept the old one and added a test script.

I added a new class and kept the old one if we need it. I also added a small test script.