primer commit del refactor. VERIFICAR TESTS