working on r3 in new branch.

will merge when r2 is done.