Adapter pattern, some sorting and random numbers.
Merge remote-tracking branch 'origin/master'