Changes to Michael Esler between r2 and r7

Totally Awesome.

Legend

     Only in r2
     Only in r7
     -->      Modified slightly between r2 and r7