new fun edit

I think this is ready to be added, see ma no merge conflicts!!