Client side changes to match server side
Merge branch 'master' of github.com:communistWatermelon/backsnakes