Turn eventQ into loop - no more chunky code