refactor queueing
move literally everything