had to fix this so it would work with these
trying to fix this in r2_index to contain merged master stuff
Added notes, completed coding
Merge branch 'r2_index'