Continued work on parsing code