Adding Class Picker and Stars and States.