Fleshed out some more classes.