Perhaps later? This code was just refactored into new class from existing.