If you want to include any/all of this in your demo repo consider yourself duly authorized. Least I can do for the work you saved me.