some basic flow code added to the queue, nothing permanent
fixed small merge error in queue