Added queue, removed old grouped listing
Merge pull request #198 from GrygrFlzr/master

Added queue, removed old grouped listing