updated to use the classes

uses the classes I made and updates some other random stuff