Moved things around, added queue implementations