WIP

My parent has the timing printlns, if you want to recover them.
Whitespace fixes.