Add queue stuff
Merge