Classes

These are along the lines of what I think the classes should look like.