R2_Control class working, need to update main.