Initial commit
Fixed a number of classes.