Had that in mind, too. Okay when this gets into some stable shape I will factor this out to a separate PR because it's pretty self sufficient.