Add in files from Gary Bernhardt.