makes progress on number 2
adds Julie's work with Shawn's numbers 1 and part of 2.