decoupling set_number, adding classes