fixed queue, added time of queue, added bunch of TODOs