started working on massaging the r2d terms. Got somewhat something in the right direction