queueing logic and stuff
merge