merge Matt's branch3 into Jim's branch2

Have fun!