Extended Queue to serve our needs + Tests