Yes, we are doing it by hand, so I think it's a good idea to move this responsability into a new class