gddh

@SeBsZ working to get this done. Thank you for your patience! @jaryszek Apologies for the delay. Working on this now

@jaryszek I'll do my best to get it done and to get some other issues fixed given my constraints. I cannot guarantee I can get to them, but I will...