Added LineGenerator
Added more stuff
Merge branch 'Integration' into Bret
Bret I merged my shit with your branch, it should build.