Updates to work on the more complete quips on the server side.