More files and randomizing
Merge with master