WIP - refactor related to gp-queue-refactor