Add a couple of classes and some structure.