Added new class and some line

I added a bunch of new stuff