Progress on mock blinding
Blinding progress. Compiles & passes old tests.