Framework for more general fix to issue 27, setting the proper cpu based on the general class.
Still only working for intel for now, but other cpu classes can now be added as they are encountered and needed.