Finished try 1 of adding queue stuffs