Convert RC -> R6
RC -> R6 fixes
New class design