Bringing things to a more OOP, making things faster, and more organization