Alterations to many things

Added some classes and changed some.