Doing most everything in the class

Made some changes. Moved a bunch of stuff to the class. Still might be able to move more over.