Update server to handle multiple requests sequentially, need to update tests though..