Agreed, let's go with one class for now.