Rent a class

Restore #1