Enqueue improvements

[csrui]

Hey @jasonagnew,

Did you have the time to look at the pull request I sent?

#12

[jeremyzahner]

@csrui I just answered directly in your PR (#12).
If you would kindly resolve any merge conflicts, we could probably merge this thing pretty soon. =)