Added a couple classes

Not much.