more cleansing
more cleansing
prepd _gen
gen code looks done
moved main to test/. tests pass.