Everything seems to be working (I was fixing the client) - commiting here