Begin implementing user uploading to esclient
fix merge conflicts with user