Updates to class 2 and 3 in progress. Removing DOM from class 2 and into class 3.