No new functionality

I had some trouble running the package at first, so I had to re-write some to get the vignette functional again.  There are some changes made to the class structure, but nothing major.  No new functionality was introduced.  Perhaps some was lost, but I don't think so.