large refactoring, Queues added, info removed (for later implementation), example probably broken