Rent a class

Restore #2