[KLS]

I fixed some errors I found in the patch and changed how it's calculated/sent a bit and am now going to commit it. You had quite a bit more done than me, mine was more proof of concept than actual implemented system.