Revert "Revert "Worked on portfolio irems""

This reverts commit 58adbba5119bba3fc8529e7f8e8937c58e5a8a51.
Cleaned up conflict and checked portfolio