Partial 2.3.2 Add Classes

Removed link to add classes for now, leave functionality there, will
implement later