Redone the class to make it a little bit better and more efficient.. I think