Too much shit to post. Also, reviews and notes. Kinda.
Commit before BTai's merge.