now that you mentioned it, hmm i see it makes sense, i wonder why we moved this class here in this way