All of the work to try and improve things for a paper. Not quite there yet.