completed classes

Finished changing everything to classes