Continuing work from https://github.com/PulseBeamDev/pulsebeam/issues/50
Continuing work from #50