Revert "Revert "blah blah this class is over""

This reverts commit 06c5bb45856c52330203fea9e05486ba4052cf7e.