Adding all classes.

Updated Order — untested