Changed Name, and Made a new class & inerface