Merging initial queuing changes into master