Move investment tracking to Portfolio