oops should move all storage to server