Trying to decide if I need one more class