Commented out stun while figuring it out, everything seems to work except the length of the stun
Merge remote-tracking branch 'origin/master'