POC solution for #262

A proof of concept implementation