added queue + tests