Code review: 168290043:  Engine and queuing refactor and bug fixes.