Molly

lots of small/reorganizing changes - still working on the big problem