Brandon generator2

Getting closer. Generated the first one, but tests are in the process...