Apart from this rest of the changes look good to me, @markewallace would you want to confirm once ?