some progress, trimmed off some files