Working queue

As per usual, comments are welcome :)

Fixes #380