client now only requests one thing at a time
Merge branch 'master' into deploy_client