Current state, clients creating files of size 0
Fixing merge conflicts