Get server uploads working

Change-Id: I058843d09a8160c34fc81be7bfaac7e83a9d8431
Server shit

Change-Id: I1456ea3de083ea186cbcb8fa4324e9d1f8afc45a