Starting to flesh out classes

Not done yet.