Got rid of old class selection process

Not convinced it's the best way but it certainly looks better