Cleaned up code.  Working towards getting it repeatable.