"Queue management" initial commit