Added a queue and a few WIP with lists