clean this up a bit
comment out generator
working middleman
clean up
Merge branch 'middleman'