Queue classifications

Closes #48 
I agree. I think that was there previously (no idea why the diff show it as added code). I'll reduce the number though.