WIP. Started implementing VIR-63 (for VIR-6).