Continue working on saving data