Move rapport-writing mess to its own branch so I can continue to work on the code
And have a clean slate