New generate engine

Also starting to use underscore