Proof of concept commit to open a PR.

Essentially this is the latest master.