Working format before noise addition

Cleaned up code and comments, works right now, before the addition of
the noise.
Most current sync, as of writing GRL draft Sept 8