A few main changes

To adjust to using multiple classes as opposed to one class