Small progress on r port.