Pushed as 7722c367bc007ca979bc7cb16e135c7ac0b864ed with a few edits.
Thanks.