Working on portfolio functionality