Merging in Joe's Changes

Merging in changes from branch access. This should be a working copy of
the project.