Added Save support, basic read/save complete