More work on issue #8
More stuff ported to new Gen implementation. Still WIP, rebase will occur on this branch