Started with new queue
More queue
Changed names and fixes some memory leaks