Completed first pass of parser for API version 1.