work in progress --  move to flat constituent file