Retooling everything to point to RRAITemplate's functions