interim commit - refactor of queue & invocation