Got shift-queueing working for now