Updating Bradley's repository with Jeffrey's work.