Changed to handle signal stuttering
Still getting it working
Changes realted to merging