Incorporate Collections changes. Fix things...

Can now compile fibonacci and q1 all the way through