More work on new Gen implementation. Tests next