[DF-878] - infrastructure & logic