Trying to fix single queue deletions

Pushing latest changes so I can begin trying services in Android (and most likely failing and having to return back to this point).