Nearing a complete parser. Need to test some edge cases.