Lots of changes

Getting ready to write our paper.