Build out a first attempt based on the findings from #28
Build out a first attempt based on the findings from #28