Slowly but surely getting things together.  Rewrote almost all of the logic