Further updates

Started on the queue processing