Refactor some of our client queue stuff