New parsing, almost done