Implemented some more parsing.