Added rest of parsing code.