Taking out portfolio to be reworked by issue #3