RR 2.5.0-RR complete

Going all Rafiki in here time-wise.