Added delay timer to server
Fixing merge conflicts
Finished merge conflicts
Fixing current merge conflict