Attempt to restructure how we get classes