Rewrote queue, added suspend and close features