Created the first queuing system from the spec, added the tests for it and modified the current code to use the system rather than a mock.