Queue refac

Woot