Jeffdev

Pulling in current jeffdev branch even though there a bunch of "holes" presently.