Rent a class

Restore #3