Queue classifications

Closes #48 
refactor these duplicate definitions. Possibly like https://gist.github.com/camallen/a15e61b06f90b6511e8b