All previous (not-merged) PRs in a new big-fat-one

Previous PR didn't merge. And didn't work together. So I dealt with conflicts and fixed that stuff. And now you have a single bit fat one, with an impossible code review. Good luck!