Fields now ordered as returned from server.  Close #4