merging stub with previous milestone basicStorageServer