Add saving/loading code for real