Shadowing and Portfolio stuff added