Also, update to the list. Realized omitting classes is a bit silly.