This atrocity works with classes now!