Complete 2.3.2 Add Classes