Semi-working parsing, still bugs when OR