[DF-3486] First draft implementation without save/load