Diff rot

hey jack.

I merged staging into your branch to fix the PR, and also I renamed p0br, if you can think of a better name than the one I gave it, all good :)