Scaffolding for IDPs

DS-30
DS-33 #complete #resolve