Co-authored-by: Martin Renvoize <martin.renvoize@openfifth.co.uk>

Portions by justdave r=mrenvoize
Portions by mrenvoize r=justdave