Added Several Classes.

Still working, not an official release. (NAOR)