Added more states and ability to add and remove classes