Flesh out some classes