Added task queue, and other stuff