added queue and comments, prep to debug slowness