QueuedItemController refactoring complete. All specs green.
Merge branch 'spike.refactor_QueuedItemController'