First pass at GEN-2

GEN-2 appears to work.  Will push to prod and have users perform full
test.