Update TODO
Rename queue to state_queue
Update the resource manager a little bit (WIP)