Client sending integer id
Hopefully this merge didn't break anything