Merge "Round out the QS API"