Start work on much simplified queue