committing some local changes before I blow away the old stuff to make it compatible with the submission format