Putting debug queue stuff on the back burner for now