Additional Push

Attemping to add missing classes.