Pushed as 582d0108d6e3e225dab810e6c0c03f8a4ca33e1c with a few edits.
Thanks.