Revert "Revert "Shane's paper. Includes a change for Inkoo's old paper.""

This reverts commit e3c24592f851c6497e61173d5a94255210353a6d.