More debugging.  Changed ID/Queue structures