Proof of concept commit to open a PR. Esentially this is the latest master.