Folks waiting on code reviews from me - it's been a mad week, but I will get to them this weekend, I promise!