are these 10 lines worth a new class? I can do that in another PR if you think it is better