Tom's initial commit of dev work.
Fixed conflicts after merging with Russ's source.