transformers

f73db2b6 - bunch of cleanup and let's not sample, easier to teset