Finish queuing logic, and start working on cargo logic