Un-pushed stuff from a while ago.

I think there was some internal refactoring and (slightly) updated Core, but still out of date now.
Merge branch 'master' of https://github.com/Jman012/Toxicity