For Review

I think I've finally managed to get it right this time.
Hopefully the metrics and such aren't too jacked I figured out I was just using merges wrong.
But you should still sort of poke through it and double check.

The commit from "Jay Rooney" is T3ch's fault for setting me up with a weird account on his computer a while ago.