Updated to handle saving/loading to and from the server