copy original files
merge in GF(59) attempt from untracked changes