moar cleanup.
Moved intermediate results to testing branch.