Added missing classes.
Did stuff.