BUG: Forgot to log.  One line of code... several hours of compute.
May as well do the crossing and squaring here to save on IO.
Some formatting and functionallity improvements.