implement portfolio mgmt and showing part 1
fix conflict
portfolio updated