Merge lexi repo into Jake
Removed PortfolioReport
FFFFFFFFF
Merge 7