Add Class. Add categories.

Add Class. Add categories.