Added lots of portfolio functionality