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