Getting very close to being able to merge this branch.  Still a bit more to be done, however.