Added Classes

More stuff