Financial Assets In A Heterogeneous Agent General Equilibrium Model With Aggregate And Idiosyncratic Risk