This could have a lot more obviously, but just laying down my thoughts as a starting point. Closes: #374 Approved by: jlebon