Convert the temp class to the model class

I’m thinking I like Dr. B’s approach better.