Upon adding/removing while a queue is in process it will now correctly re-build the queue if the queue items added/removed were in range of the working set.
Also hoping to fix more null pointers