a few changes, nowhere near building
merge
Merge pull request #51 from sanity/regressor-refactor-ian-variation

a few changes, nowhere near building