Added various classes and cool stuff