Added more classes fixed every bug in classes... so far