WIP. Code cleanup.  Added R1Cn support so that the RC interface is clear.