Mostly finished parsing. A bit of testing to do.