Restructured based on RR superclass assumptions, currently tests fail.