First pass: add customisable headers

Thanks johnno