changed stuff to use class real fast like