[DF-29] save/load work in progress