Working on merging in Rory's test.  Reformatting sections a bit...