remaking queue (WIP)