Updated and tested.  I made 1 minor change to the joins, but other than that, working good w/ latest commit.