Now storing phi2's.  Also calculate phi2 in separate function.