Complete initial basic parsing, no real tests yet