Private Equity _ performance fee and carried interest calculations

Hi 

presently I’m in the process of building a hybrid waterfall calculation model —-  where I need to show both portfolio company information as well as Investor level carry calculations.   I build modules surrounding investor level carried calculations -  should I proceed building out modules to incorporate the positions as well within the same model.  Any feedback is greatly appreciated .