Quick it compiled
move some stuff between files
Make name generator return something every time

Q is not important enough to bother with
Failing tests