Added more classes

will add more detail