MAJOR REFACTOR ON PORTFOLIO